summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README64
-rw-r--r--actions/all.php16
-rw-r--r--actions/apiaccountratelimitstatus.php2
-rw-r--r--actions/apiaccountupdatedeliverydevice.php1
-rw-r--r--actions/apiaccountverifycredentials.php2
-rw-r--r--actions/apidirectmessage.php3
-rw-r--r--actions/apidirectmessagenew.php8
-rw-r--r--actions/apifavoritecreate.php1
-rw-r--r--actions/apifavoritedestroy.php1
-rw-r--r--actions/apigroupcreate.php1
-rw-r--r--actions/apigroupismember.php1
-rw-r--r--actions/apigroupjoin.php1
-rw-r--r--actions/apigroupleave.php1
-rw-r--r--actions/apigrouplist.php1
-rw-r--r--actions/apigrouplistall.php1
-rw-r--r--actions/apigroupmembership.php1
-rw-r--r--actions/apigroupprofileupdate.php367
-rw-r--r--actions/apigroupshow.php1
-rw-r--r--actions/apisearchatom.php (renamed from actions/twitapisearchatom.php)32
-rw-r--r--actions/apisearchjson.php (renamed from actions/twitapisearchjson.php)7
-rw-r--r--actions/apistatusesdestroy.php69
-rw-r--r--actions/apistatusesretweet.php2
-rw-r--r--actions/apistatusesshow.php1
-rw-r--r--actions/apistatusesupdate.php104
-rw-r--r--actions/apisubscriptions.php3
-rw-r--r--actions/apitimelinefavorites.php13
-rw-r--r--actions/apitimelinefriends.php100
-rw-r--r--actions/apitimelinegroup.php3
-rw-r--r--actions/apitimelinehome.php3
-rw-r--r--actions/apitimelinementions.php3
-rw-r--r--actions/apitimelinepublic.php92
-rw-r--r--actions/apitimelineretweetsofme.php2
-rw-r--r--actions/apitimelinetag.php3
-rw-r--r--actions/apitimelineuser.php3
-rw-r--r--actions/apitrends.php (renamed from actions/twitapitrends.php)8
-rw-r--r--actions/apiusershow.php2
-rw-r--r--actions/block.php46
-rw-r--r--actions/deleteuser.php4
-rw-r--r--actions/designadminpanel.php104
-rw-r--r--actions/favoritesrss.php2
-rw-r--r--actions/foaf.php34
-rw-r--r--actions/geocode.php1
-rw-r--r--actions/groupblock.php4
-rw-r--r--actions/imsettings.php17
-rw-r--r--actions/login.php32
-rw-r--r--actions/oembed.php1
-rw-r--r--actions/publicxrds.php3
-rw-r--r--actions/register.php55
-rw-r--r--actions/showfavorites.php8
-rw-r--r--actions/showgroup.php10
-rw-r--r--actions/subscriptions.php8
-rw-r--r--actions/version.php2
-rwxr-xr-x[-rw-r--r--]avatar/.gitignore0
-rw-r--r--classes/Fave.php4
-rw-r--r--classes/File.php22
-rw-r--r--classes/Inbox.php9
-rw-r--r--classes/Memcached_DataObject.php36
-rw-r--r--classes/Notice.php164
-rw-r--r--classes/Profile.php10
-rw-r--r--classes/Queue_item.php13
-rw-r--r--classes/Reply.php14
-rw-r--r--classes/Status_network.php58
-rw-r--r--classes/User.php4
-rw-r--r--classes/User_group.php15
-rw-r--r--classes/User_im_prefs.php23
-rw-r--r--classes/statusnet.ini6
-rw-r--r--config.php.sample2
-rw-r--r--db/08to09_pg.sql39
-rw-r--r--db/notice_source.sql6
-rw-r--r--db/statusnet_pg.sql91
-rw-r--r--doc-src/sms2
-rwxr-xr-x[-rw-r--r--]extlib/Mail.php82
-rwxr-xr-x[-rw-r--r--]extlib/Mail/RFC822.php83
-rwxr-xr-x[-rw-r--r--]extlib/Mail/mail.php63
-rwxr-xr-x[-rw-r--r--]extlib/Mail/mock.php64
-rwxr-xr-x[-rw-r--r--]extlib/Mail/null.php64
-rwxr-xr-x[-rw-r--r--]extlib/Mail/sendmail.php7
-rwxr-xr-x[-rw-r--r--]extlib/Mail/smtp.php73
-rwxr-xr-x[-rw-r--r--]extlib/Mail/smtpmx.php44
-rw-r--r--extlib/Net/SMTP.php198
-rw-r--r--index.php6
-rw-r--r--install.php1
-rw-r--r--js/util.js2
-rw-r--r--lib/action.php12
-rw-r--r--lib/activity.php14
-rw-r--r--lib/activityutils.php12
-rw-r--r--lib/adminpanelaction.php3
-rw-r--r--lib/apiaction.php212
-rw-r--r--lib/apiauth.php22
-rw-r--r--lib/apibareauth.php3
-rw-r--r--lib/apiprivateauth.php1
-rw-r--r--lib/atomgroupnoticefeed.php24
-rw-r--r--lib/atomnoticefeed.php24
-rw-r--r--lib/atomusernoticefeed.php5
-rw-r--r--lib/authenticationplugin.php1
-rw-r--r--lib/authorizationplugin.php1
-rw-r--r--lib/avatarlink.php2
-rw-r--r--lib/common.php10
-rw-r--r--lib/connectsettingsaction.php4
-rw-r--r--lib/dbqueuemanager.php4
-rw-r--r--lib/default.php19
-rw-r--r--lib/distribqueuehandler.php17
-rw-r--r--lib/httpclient.php14
-rw-r--r--lib/implugin.php32
-rw-r--r--lib/installer.php29
-rw-r--r--lib/language.php27
-rw-r--r--lib/liberalstomp.php27
-rw-r--r--lib/mail.php34
-rw-r--r--lib/mailhandler.php4
-rw-r--r--lib/mediafile.php54
-rw-r--r--lib/noticelist.php72
-rw-r--r--lib/pgsqlschema.php55
-rw-r--r--lib/ping.php10
-rw-r--r--lib/plugin.php1
-rw-r--r--lib/popularnoticesection.php2
-rw-r--r--lib/profileformaction.php13
-rw-r--r--lib/redirectingaction.php9
-rw-r--r--lib/router.php33
-rw-r--r--lib/stompqueuemanager.php21
-rw-r--r--lib/theme.php82
-rw-r--r--lib/themeuploader.php311
-rw-r--r--lib/util.php103
-rw-r--r--lib/xrdsoutputter.php1
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po756
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po878
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po756
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po816
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po1182
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po2476
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po757
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po987
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po755
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po1078
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po774
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po2715
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po760
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po778
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po757
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po2207
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po757
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po1260
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po968
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po757
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po847
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po762
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po764
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po999
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po1429
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po771
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po763
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po768
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po1495
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po962
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po781
-rw-r--r--locale/statusnet.pot748
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po765
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po961
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po757
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po851
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po759
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po778
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po756
-rw-r--r--plugins/Aim/AimPlugin.php9
-rw-r--r--plugins/Aim/README2
-rw-r--r--plugins/AutoSandbox/locale/AutoSandbox.pot21
-rw-r--r--plugins/Autocomplete/AutocompletePlugin.php15
-rw-r--r--plugins/Autocomplete/autocomplete.php1
-rw-r--r--plugins/Autocomplete/locale/Autocomplete.pot24
-rw-r--r--plugins/BitlyUrl/BitlyUrlPlugin.php2
-rw-r--r--plugins/BitlyUrl/locale/BitlyUrl.pot22
-rw-r--r--plugins/Blacklist/BlacklistPlugin.php4
-rw-r--r--plugins/Blacklist/Homepage_blacklist.php4
-rw-r--r--plugins/Blacklist/Nickname_blacklist.php4
-rw-r--r--plugins/Blacklist/blacklistadminpanel.php29
-rw-r--r--plugins/Blacklist/locale/Blacklist.pot54
-rw-r--r--plugins/CasAuthentication/CasAuthenticationPlugin.php2
-rw-r--r--plugins/CasAuthentication/locale/CasAuthentication.pot35
-rw-r--r--plugins/ClientSideShorten/ClientSideShortenPlugin.php81
-rw-r--r--plugins/ClientSideShorten/README6
-rw-r--r--plugins/ClientSideShorten/locale/ClientSideShorten.pot27
-rw-r--r--plugins/ClientSideShorten/shorten.js77
-rw-r--r--plugins/ClientSideShorten/shorten.php69
-rw-r--r--plugins/DirectionDetector/DirectionDetectorPlugin.php38
-rw-r--r--plugins/DirectionDetector/locale/DirectionDetector.pot21
-rw-r--r--plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po22
-rw-r--r--plugins/EmailAuthentication/EmailAuthenticationPlugin.php2
-rw-r--r--plugins/EmailAuthentication/locale/EmailAuthentication.pot23
-rw-r--r--plugins/Facebook/FacebookPlugin.php2
-rw-r--r--plugins/Facebook/README10
-rw-r--r--plugins/Facebook/facebook/facebook.php74
-rwxr-xr-xplugins/Facebook/facebook/facebookapi_php5_restlib.php56
-rw-r--r--plugins/Facebook/facebooksettings.php21
-rw-r--r--plugins/Facebook/facebookutil.php276
-rw-r--r--plugins/Facebook/locale/Facebook.pot378
-rw-r--r--plugins/FirePHP/FirePHPPlugin.php8
-rw-r--r--plugins/FirePHP/locale/FirePHP.pot21
-rw-r--r--plugins/GeonamesPlugin.php2
-rw-r--r--plugins/Gravatar/locale/Gravatar.pot2
-rw-r--r--plugins/Imap/ImapPlugin.php4
-rw-r--r--plugins/Imap/imapmanager.php2
-rw-r--r--plugins/Imap/locale/Imap.pot27
-rw-r--r--plugins/InfiniteScroll/InfiniteScrollPlugin.php2
-rw-r--r--plugins/InfiniteScroll/locale/InfiniteScroll.pot25
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php2
-rw-r--r--plugins/LdapAuthentication/locale/LdapAuthentication.pot23
-rw-r--r--plugins/LdapAuthorization/LdapAuthorizationPlugin.php2
-rw-r--r--plugins/LdapAuthorization/locale/LdapAuthorization.pot23
-rw-r--r--plugins/LdapCommon/LdapCommon.php2
-rw-r--r--plugins/LdapCommon/MemcacheSchemaCache.php2
-rw-r--r--plugins/LilUrl/LilUrlPlugin.php2
-rw-r--r--plugins/LilUrl/locale/LilUrl.pot22
-rw-r--r--plugins/Mapstraction/MapstractionPlugin.php6
-rw-r--r--plugins/Mapstraction/allmap.php1
-rw-r--r--plugins/Mapstraction/locale/Mapstraction.pot34
-rw-r--r--plugins/Mapstraction/map.php1
-rw-r--r--plugins/Mapstraction/usermap.js2
-rw-r--r--plugins/Mapstraction/usermap.php1
-rw-r--r--plugins/MemcachedPlugin.php8
-rw-r--r--plugins/Meteor/MeteorPlugin.php15
-rw-r--r--plugins/Minify/MinifyPlugin.php1
-rw-r--r--plugins/Minify/locale/Minify.pot23
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php5
-rw-r--r--plugins/MobileProfile/locale/MobileProfile.pot21
-rw-r--r--plugins/OStatus/OStatusPlugin.php11
-rw-r--r--plugins/OStatus/actions/ostatussub.php14
-rw-r--r--plugins/OStatus/classes/HubSub.php51
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php28
-rw-r--r--plugins/OStatus/lib/discoveryhints.php3
-rw-r--r--plugins/OStatus/lib/feeddiscovery.php2
-rw-r--r--plugins/OStatus/lib/ostatusqueuehandler.php31
-rw-r--r--plugins/OStatus/locale/OStatus.pot319
-rw-r--r--plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po109
-rw-r--r--plugins/OStatus/scripts/resub-feed.php74
-rw-r--r--plugins/OStatus/scripts/update-profile.php147
-rw-r--r--plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot21
-rw-r--r--plugins/OpenID/OpenIDPlugin.php86
-rw-r--r--plugins/OpenID/extlib/README6
-rw-r--r--plugins/OpenID/extlib/teams-extension.php175
-rw-r--r--plugins/OpenID/finishaddopenid.php27
-rw-r--r--plugins/OpenID/finishopenidlogin.php51
-rw-r--r--plugins/OpenID/locale/OpenID.pot388
-rw-r--r--plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po457
-rw-r--r--plugins/OpenID/openid.php80
-rw-r--r--plugins/OpenID/openidadminpanel.php280
-rw-r--r--plugins/OpenID/openidlogin.php57
-rw-r--r--plugins/OpenID/openidserver.php17
-rw-r--r--plugins/OpenID/openidsettings.php70
-rw-r--r--plugins/PostDebug/locale/PostDebug.pot21
-rw-r--r--plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot2
-rw-r--r--plugins/PtitUrl/PtitUrlPlugin.php2
-rw-r--r--plugins/PtitUrl/locale/PtitUrl.pot22
-rw-r--r--plugins/RSSCloud/RSSCloudPlugin.php20
-rw-r--r--plugins/RSSCloud/locale/RSSCloud.pot24
-rw-r--r--plugins/Realtime/README1
-rw-r--r--plugins/Realtime/RealtimePlugin.php42
-rw-r--r--plugins/Realtime/realtimeupdate.js4
-rw-r--r--plugins/Recaptcha/RecaptchaPlugin.php30
-rw-r--r--plugins/Recaptcha/locale/Recaptcha.pot23
-rw-r--r--plugins/RegisterThrottle/locale/RegisterThrottle.pot29
-rw-r--r--plugins/RequireValidatedEmail/README14
-rw-r--r--plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php55
-rw-r--r--plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot2
-rw-r--r--plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php2
-rw-r--r--plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot24
-rw-r--r--plugins/Sample/User_greeting_count.php19
-rw-r--r--plugins/Sample/locale/Sample.pot38
-rw-r--r--plugins/SimpleUrl/SimpleUrlPlugin.php2
-rw-r--r--plugins/SimpleUrl/locale/SimpleUrl.pot22
-rw-r--r--plugins/Sitemap/SitemapPlugin.php218
-rw-r--r--plugins/Sitemap/Sitemap_notice_count.php288
-rw-r--r--plugins/Sitemap/Sitemap_user_count.php284
-rw-r--r--plugins/Sitemap/noticesitemap.php137
-rw-r--r--plugins/Sitemap/sitemapaction.php95
-rw-r--r--plugins/Sitemap/sitemapadminpanel.php205
-rw-r--r--plugins/Sitemap/sitemapindex.php128
-rw-r--r--plugins/Sitemap/usersitemap.php128
-rw-r--r--plugins/TabFocus/TabFocusPlugin.php2
-rw-r--r--plugins/TabFocus/locale/TabFocus.pot24
-rw-r--r--plugins/TightUrl/TightUrlPlugin.php2
-rw-r--r--plugins/TightUrl/locale/TightUrl.pot22
-rw-r--r--plugins/TwitterBridge/TwitterBridgePlugin.php2
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php2
-rw-r--r--plugins/TwitterBridge/locale/TwitterBridge.pot93
-rw-r--r--plugins/TwitterBridge/twitter.php6
-rw-r--r--plugins/TwitterBridge/twitterbasicauthclient.php31
-rw-r--r--plugins/TwitterBridge/twitteroauthclient.php30
-rw-r--r--plugins/UserFlag/clearflag.php2
-rw-r--r--plugins/UserFlag/flagprofile.php2
-rw-r--r--plugins/WikiHowProfile/README6
-rw-r--r--plugins/WikiHowProfile/WikiHowProfilePlugin.php196
-rw-r--r--plugins/Xmpp/Queued_XMPP.php (renamed from plugins/Xmpp/Fake_XMPP.php)17
-rw-r--r--plugins/Xmpp/XmppPlugin.php39
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/BOSH.php (renamed from extlib/XMPPHP/BOSH.php)0
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/Exception.php (renamed from extlib/XMPPHP/Exception.php)0
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/Log.php (renamed from extlib/XMPPHP/Log.php)0
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/Roster.php (renamed from extlib/XMPPHP/Roster.php)0
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/XMLObj.php (renamed from extlib/XMPPHP/XMLObj.php)0
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/XMLStream.php (renamed from extlib/XMPPHP/XMLStream.php)0
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/XMPP.php (renamed from extlib/XMPPHP/XMPP.php)4
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php (renamed from extlib/XMPPHP/XMPP_Old.php)0
-rw-r--r--scripts/apidocs.config1551
-rw-r--r--scripts/commandline.inc4
-rwxr-xr-xscripts/docgen.php38
-rw-r--r--tests/ActivityParseTests.php77
-rw-r--r--tests/MediaFileTest.php96
-rw-r--r--tests/sample-uploads/image.gifbin0 -> 35 bytes
-rw-r--r--tests/sample-uploads/image.jpegbin0 -> 306 bytes
-rw-r--r--tests/sample-uploads/image.jpgbin0 -> 306 bytes
-rw-r--r--tests/sample-uploads/image.pngbin0 -> 159 bytes
-rw-r--r--tests/sample-uploads/office.pdfbin0 -> 1162 bytes
-rw-r--r--tests/sample-uploads/presentation.odpbin0 -> 9330 bytes
-rw-r--r--tests/sample-uploads/presentation.otpbin0 -> 9359 bytes
-rw-r--r--tests/sample-uploads/presentation.potbin0 -> 71168 bytes
-rw-r--r--tests/sample-uploads/presentation.potmbin0 -> 5789 bytes
-rw-r--r--tests/sample-uploads/presentation.pptbin0 -> 71168 bytes
-rw-r--r--tests/sample-uploads/presentation.pptxbin0 -> 5790 bytes
-rw-r--r--tests/sample-uploads/spreadsheet.odsbin0 -> 6560 bytes
-rw-r--r--tests/sample-uploads/spreadsheet.otsbin0 -> 6575 bytes
-rw-r--r--tests/sample-uploads/spreadsheet.xlsbin0 -> 6656 bytes
-rw-r--r--tests/sample-uploads/spreadsheet.xlsxbin0 -> 6010 bytes
-rw-r--r--tests/sample-uploads/spreadsheet.xltbin0 -> 6144 bytes
-rw-r--r--tests/sample-uploads/wordproc.docbin0 -> 9216 bytes
-rw-r--r--tests/sample-uploads/wordproc.docxbin0 -> 3350 bytes
-rw-r--r--tests/sample-uploads/wordproc.odtbin0 -> 7641 bytes
-rw-r--r--tests/sample-uploads/wordproc.ottbin0 -> 7656 bytes
-rw-r--r--tests/sample-uploads/wordproc.rtf16
326 files changed, 31660 insertions, 19360 deletions
diff --git a/README b/README
index dcf305ea6..e282e0c32 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
README
------
-StatusNet 0.9.1 ("Everybody Hurts")
-28 Mar 2010
+StatusNet 0.9.2 ("King of Birds")
+3 May 2010
This is the README file for StatusNet, the Open Source microblogging
platform. It includes installation instructions, descriptions of
@@ -77,7 +77,7 @@ for additional terms.
New this version
================
-This is a minor bug and feature release since version 0.9.0 released 4
+This is a minor bug and feature release since version 0.9.1 released 28
March 2010.
Because of fixes to OStatus bugs, it is highly recommended that all
@@ -85,26 +85,32 @@ public sites upgrade to the new version immediately.
Notable changes this version:
-- Twitter bridge truncates and links back to original for long
- notices.
-- Changed "Home" link in main menu to "Personal".
-- A new memcached plugin (using pecl/memcached versus pecl/memcache)
-- Opt-in subscription to update@status.net
-- Script to run commands on behalf of a user.
-- Better Web UI for long notices.
-- A plugin to open external links in their own window or tab
-- Fixes to Salmon protocol for compatibility with other systems.
-- Updates to latest ActivityStreams definition.
-- Twitpic-compatible API for image upload.
-- Background deletion of user accounts.
-- Better support for HTTP basic authentication with CGI/FastCGI
-- Better discovery on OStatus
-- Support for PuSH-enabled RSS 2.0 feeds
-- OpenID-only mode
-- OpenID blacklist/whitelist
-- OStatus unit tests
-
-A full changelog is available at http://status.net/wiki/StatusNet_0.9.1.
+- Installer no longer fails with a PHP fatal error when trying to set up the
+ subscription to update@status.net
+- Fixed email notifications for @-replies that come in via OStatus
+- OStatus related Fixes to the cloudy theme
+- Pass geo locations over Twitter bridge (will only be used if enabled on the
+ Twitter side)
+- scripts/showplugins.php - script to dump the list of activated plugins and
+ their settings
+- scripts/fixup_blocks.php - script to finds any stray subscriptions in
+ violation of blocks, and removes them
+- Allow blocking someone who's not currently subscribed to you (prevents
+ seeing @-replies from them, or them subbing to you in future)
+- Default 2-second timeout on Geonames web service lookups
+- Improved localization for plugins
+- New anti-spam measures: added nofollow rels to group members list,
+ subscribers list
+- Shared cache key option for Geonames plugin (lets multi-instance sites
+ share their cached geoname lookups)
+- Stability fixes to the TwitterStatusFetcher
+- If user allows location sharing but turned off browser location use profile
+ location
+- Improved group listing via the API
+- Improved FOAF output
+- Several other bugfixes
+
+A full changelog is available at http://status.net/wiki/StatusNet_0.9.2.
Prerequisites
=============
@@ -216,9 +222,9 @@ especially if you've previously installed PHP/MySQL packages.
1. Unpack the tarball you downloaded on your Web server. Usually a
command like this will work:
- tar zxf statusnet-0.9.1.tar.gz
+ tar zxf statusnet-0.9.2.tar.gz
- ...which will make a statusnet-0.9.1 subdirectory in your current
+ ...which will make a statusnet-0.9.2 subdirectory in your current
directory. (If you don't have shell access on your Web server, you
may have to unpack the tarball on your local computer and FTP the
files to the server.)
@@ -226,7 +232,7 @@ especially if you've previously installed PHP/MySQL packages.
2. Move the tarball to a directory of your choosing in your Web root
directory. Usually something like this will work:
- mv statusnet-0.9.1 /var/www/statusnet
+ mv statusnet-0.9.2 /var/www/statusnet
This will make your StatusNet instance available in the statusnet path of
your server, like "http://example.net/statusnet". "microblog" or
@@ -641,7 +647,7 @@ with this situation.
If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've
been tracking the "git" version of the software, you will probably
want to upgrade and keep your existing data. There is no automated
-upgrade procedure in StatusNet 0.9.1. Try these step-by-step
+upgrade procedure in StatusNet 0.9.2. Try these step-by-step
instructions; read to the end first before trying them.
0. Download StatusNet and set up all the prerequisites as if you were
@@ -662,7 +668,7 @@ instructions; read to the end first before trying them.
5. Once all writing processes to your site are turned off, make a
final backup of the Web directory and database.
6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 0.9.1 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 0.9.2 tarball and move it to "statusnet" or
wherever your code used to be.
8. Copy the config.php file and avatar directory from your old
directory to your new directory.
@@ -1539,7 +1545,7 @@ repository (see below), and you get a compilation error ("unexpected
T_STRING") in the browser, check to see that you don't have any
conflicts in your code.
-If you upgraded to StatusNet 0.9.1 without reading the "Notice
+If you upgraded to StatusNet 0.9.2 without reading the "Notice
inboxes" section above, and all your users' 'Personal' tabs are empty,
read the "Notice inboxes" section above.
diff --git a/actions/all.php b/actions/all.php
index a977fce95..9c01b6393 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -18,15 +18,19 @@
*
* @category Actions
* @package Actions
- * @author Evan Prodromou <evan@status.net>
- * @author Mike Cochrane <mikec@mikenz.geek.nz>
- * @author Robin Millette <millette@controlyourself.ca>
* @author Adrian Lang <mail@adrianlang.de>
- * @author Meitar Moscovitz <meitarm@gmail.com>
- * @author Sarven Capadisli <csarven@status.net>
+ * @author Brenda Wallace <shiny@cpan.org>
+ * @author Brion Vibber <brion@pobox.com>
* @author Craig Andrews <candrews@integralblue.com>
+ * @author Evan Prodromou <evan@status.net>
* @author Jeffery To <jeffery.to@gmail.com>
- * @author Zach Copley <zach@controlyourself.ca>
+ * @author Meitar Moscovitz <meitarm@gmail.com>
+ * @author Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author Robin Millette <millette@status.net>
+ * @author Sarven Capadisli <csarven@status.net>
+ * @author Siebrand Mazeland <s.mazeland@xs4all.nl>
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license GNU Affero General Public License http://www.gnu.org/licenses/
* @link http://status.net
*/
diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index f19e315bf..e2dff2db9 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -21,8 +21,10 @@
*
* @category API
* @package StatusNet
+ * @author Brion Vibber <brion@pobox.com>
* @author Evan Prodromou <evan@status.net>
* @author Robin Millette <robin@millette.info>
+ * @author Siebrand Mazeland <s.mazeland@xs4all.nl>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php
index d42d25a61..e25b9a954 100644
--- a/actions/apiaccountupdatedeliverydevice.php
+++ b/actions/apiaccountupdatedeliverydevice.php
@@ -21,6 +21,7 @@
*
* @category API
* @package StatusNet
+ * @author Siebrand Mazeland <s.mazeland@xs4all.nl>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index ea61a3205..79416e9b2 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -75,7 +75,7 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
if ($this->format == 'xml') {
$this->initDocument('xml');
- $this->showTwitterXmlUser($twitter_user);
+ $this->showTwitterXmlUser($twitter_user, 'user', true);
$this->endDocument('xml');
} elseif ($this->format == 'json') {
$this->initDocument('json');
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 53da9e0c6..7a0f46274 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -232,7 +232,8 @@ class ApiDirectMessageAction extends ApiAuthAction
function showXmlDirectMessages()
{
$this->initDocument('xml');
- $this->elementStart('direct-messages', array('type' => 'array'));
+ $this->elementStart('direct-messages', array('type' => 'array',
+ 'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
foreach ($this->messages as $m) {
$dm_array = $this->directMessageArray($m);
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index b9ac92d77..65d065648 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
class ApiDirectMessageNewAction extends ApiAuthAction
{
- var $source = null;
var $other = null;
var $content = null;
@@ -76,13 +75,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction
return;
}
- $this->source = $this->trimmed('source'); // Not supported by Twitter.
-
- $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
- if (empty($this->source) || in_array($this->source, $reserved_sources)) {
- $source = 'api';
- }
-
$this->content = $this->trimmed('text');
$this->user = $this->auth_user;
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 00b6349b0..0447a92ba 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -25,6 +25,7 @@
* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index c4daf480e..9f2efdd00 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -25,6 +25,7 @@
* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 3eb3ae5fc..d216c15cd 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index f51c747df..eaa4769f3 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 28df72fa9..5265ec629 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index f6e52b26e..8c100d58a 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 3ea2c30cb..148c802f4 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index bd05fa3ea..a8317608d 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index c97b27fac..ffd5c7c7d 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php
new file mode 100644
index 000000000..6ac4b5a4b
--- /dev/null
+++ b/actions/apigroupprofileupdate.php
@@ -0,0 +1,367 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update a group's profile
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category API
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * API analog to the group edit page
+ *
+ * @category API
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class ApiGroupProfileUpdateAction extends ApiAuthAction
+{
+
+ /**
+ * Take arguments for running
+ *
+ * @param array $args $_REQUEST args
+ *
+ * @return boolean success flag
+ *
+ */
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ $this->nickname = common_canonical_nickname($this->trimmed('nickname'));
+
+ $this->fullname = $this->trimmed('fullname');
+ $this->homepage = $this->trimmed('homepage');
+ $this->description = $this->trimmed('description');
+ $this->location = $this->trimmed('location');
+ $this->aliasstring = $this->trimmed('aliases');
+
+ $this->user = $this->auth_user;
+ $this->group = $this->getTargetGroup($this->arg('id'));
+
+ return true;
+ }
+
+ /**
+ * Handle the request
+ *
+ * See which request params have been set, and update the profile
+ *
+ * @param array $args $_REQUEST data (unused)
+ *
+ * @return void
+ */
+
+ function handle($args)
+ {
+ parent::handle($args);
+
+ if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+ $this->clientError(
+ _('This method requires a POST.'),
+ 400, $this->format
+ );
+ return;
+ }
+
+ if (!in_array($this->format, array('xml', 'json'))) {
+ $this->clientError(
+ _('API method not found.'),
+ 404,
+ $this->format
+ );
+ return;
+ }
+
+ if (empty($this->user)) {
+ $this->clientError(_('No such user.'), 404, $this->format);
+ return;
+ }
+
+ if (empty($this->group)) {
+ $this->clientError(_('Group not found.'), 404, $this->format);
+ return false;
+ }
+
+ if (!$this->user->isAdmin($this->group)) {
+ $this->clientError(_('You must be an admin to edit the group.'), 403);
+ return false;
+ }
+
+ $this->group->query('BEGIN');
+
+ $orig = clone($this->group);
+
+ try {
+
+ if (!empty($this->nickname)) {
+ if ($this->validateNickname()) {
+ $this->group->nickname = $this->nickname;
+ $this->group->mainpage = common_local_url(
+ 'showgroup',
+ array('nickname' => $this->nickname)
+ );
+ }
+ }
+
+ if (!empty($this->fullname)) {
+ $this->validateFullname();
+ $this->group->fullname = $this->fullname;
+ }
+
+ if (!empty($this->homepage)) {
+ $this->validateHomepage();
+ $this->group->homepage = $this->hompage;
+ }
+
+ if (!empty($this->description)) {
+ $this->validateDescription();
+ $this->group->description = $this->decription;
+ }
+
+ if (!empty($this->location)) {
+ $this->validateLocation();
+ $this->group->location = $this->location;
+ }
+
+ } catch (ApiValidationException $ave) {
+ $this->clientError(
+ $ave->getMessage(),
+ 403,
+ $this->format
+ );
+ return;
+ }
+
+ $result = $this->group->update($orig);
+
+ if (!$result) {
+ common_log_db_error($this->group, 'UPDATE', __FILE__);
+ $this->serverError(_('Could not update group.'));
+ }
+
+ $aliases = array();
+
+ try {
+
+ if (!empty($this->aliasstring)) {
+ $aliases = $this->validateAliases();
+ }
+
+ } catch (ApiValidationException $ave) {
+ $this->clientError(
+ $ave->getMessage(),
+ 403,
+ $this->format
+ );
+ return;
+ }
+
+ $result = $this->group->setAliases($aliases);
+
+ if (!$result) {
+ $this->serverError(_('Could not create aliases.'));
+ }
+
+ if (!empty($this->nickname) && ($this->nickname != $orig->nickname)) {
+ common_log(LOG_INFO, "Saving local group info.");
+ $local = Local_group::staticGet('group_id', $this->group->id);
+ $local->setNickname($this->nickname);
+ }
+
+ $this->group->query('COMMIT');
+
+ switch($this->format) {
+ case 'xml':
+ $this->showSingleXmlGroup($this->group);
+ break;
+ case 'json':
+ $this->showSingleJsonGroup($this->group);
+ break;
+ default:
+ $this->clientError(_('API method not found.'), 404, $this->format);
+ break;
+ }
+ }
+
+ function nicknameExists($nickname)
+ {
+ $group = Local_group::staticGet('nickname', $nickname);
+
+ if (!empty($group) &&
+ $group->group_id != $this->group->id) {
+ return true;
+ }
+
+ $alias = Group_alias::staticGet('alias', $nickname);
+
+ if (!empty($alias) &&
+ $alias->group_id != $this->group->id) {
+ return true;
+ }
+
+ return false;
+ }
+
+ function validateNickname()
+ {
+ if (!Validate::string(
+ $this->nickname, array(
+ 'min_length' => 1,
+ 'max_length' => 64,
+ 'format' => NICKNAME_FMT
+ )
+ )
+ ) {
+ throw new ApiValidationException(
+ _(
+ 'Nickname must have only lowercase letters ' .
+ 'and numbers and no spaces.'
+ )
+ );
+ } else if ($this->nicknameExists($this->nickname)) {
+ throw new ApiValidationException(
+ _('Nickname already in use. Try another one.')
+ );
+ } else if (!User_group::allowedNickname($this->nickname)) {
+ throw new ApiValidationException(
+ _('Not a valid nickname.')
+ );
+ }
+
+ return true;
+ }
+
+ function validateHomepage()
+ {
+ if (!is_null($this->homepage)
+ && (strlen($this->homepage) > 0)
+ && !Validate::uri(
+ $this->homepage,
+ array('allowed_schemes' => array('http', 'https')
+ )
+ )
+ ) {
+ throw new ApiValidationException(
+ _('Homepage is not a valid URL.')
+ );
+ }
+ }
+
+ function validateFullname()
+ {
+ if (!is_null($this->fullname) && mb_strlen($this->fullname) > 255) {
+ throw new ApiValidationException(
+ _('Full name is too long (max 255 chars).')
+ );
+ }
+ }
+
+ function validateDescription()
+ {
+ if (User_group::descriptionTooLong($this->description)) {
+ throw new ApiValidationException(
+ sprintf(
+ _('description is too long (max %d chars).'),
+ User_group::maxDescription()
+ )
+ );
+ }
+ }
+
+ function validateLocation()
+ {
+ if (!is_null($this->location) && mb_strlen($this->location) > 255) {
+ throw new ApiValidationException(
+ _('Location is too long (max 255 chars).')
+ );
+ }
+ }
+
+ function validateAliases()
+ {
+ $aliases = array_map(
+ 'common_canonical_nickname',
+ array_unique(
+ preg_split('/[\s,]+/',
+ $this->aliasstring
+ )
+ )
+ );
+
+ if (count($aliases) > common_config('group', 'maxaliases')) {
+ throw new ApiValidationException(
+ sprintf(
+ _('Too many aliases! Maximum %d.'),
+ common_config('group', 'maxaliases')
+ )
+ );
+ }
+
+ foreach ($aliases as $alias) {
+ if (!Validate::string(
+ $alias, array(
+ 'min_length' => 1,
+ 'max_length' => 64,
+ 'format' => NICKNAME_FMT)
+ )
+ ) {
+ throw new ApiValidationException(
+ sprintf(
+ _('Invalid alias: "%s"'),
+ $alias
+ )
+ );
+ }
+
+ if ($this->nicknameExists($alias)) {
+ throw new ApiValidationException(
+ sprintf(
+ _('Alias "%s" already in use. Try another one.'),
+ $alias)
+ );
+ }
+
+ // XXX assumes alphanum nicknames
+ if (strcmp($alias, $this->nickname) == 0) {
+ throw new ApiValidationException(
+ _('Alias can\'t be the same as nickname.')
+ );
+ }
+ }
+
+ return $aliases;
+ }
+
+} \ No newline at end of file
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 8e471689a..2998e505e 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/twitapisearchatom.php b/actions/apisearchatom.php
index 24aa619bd..60bb8b040 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/apisearchatom.php
@@ -22,7 +22,7 @@
* @category Search
* @package StatusNet
* @author Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -31,6 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
+require_once INSTALLDIR.'/lib/apiprivateauth.php';
+
/**
* Action for outputting search results in Twitter compatible Atom
* format.
@@ -44,10 +46,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*
- * @see ApiAction
+ * @see ApiPrivateAuthAction
*/
-class TwitapisearchatomAction extends ApiAction
+class ApiSearchAtomAction extends ApiPrivateAuthAction
{
var $cnt;
@@ -96,8 +98,11 @@ class TwitapisearchatomAction extends ApiAction
function prepare($args)
{
+ common_debug("in apisearchatom prepare()");
+
parent::prepare($args);
+
$this->query = $this->trimmed('q');
$this->lang = $this->trimmed('lang');
$this->rpp = $this->trimmed('rpp');
@@ -138,6 +143,7 @@ class TwitapisearchatomAction extends ApiAction
function handle($args)
{
parent::handle($args);
+ common_debug("In apisearchatom handle()");
$this->showAtom();
}
@@ -342,10 +348,24 @@ class TwitapisearchatomAction extends ApiAction
'rel' => 'related',
'href' => $profile->avatarUrl()));
- // TODO: Here is where we'd put in a link to an atom feed for threads
+ // @todo: Here is where we'd put in a link to an atom feed for threads
+
+ $source = null;
+
+ $ns = $notice->getSource();
+ if ($ns) {
+ if (!empty($ns->name) && !empty($ns->url)) {
+ $source = '<a href="'
+ . htmlspecialchars($ns->url)
+ . '" rel="nofollow">'
+ . htmlspecialchars($ns->name)
+ . '</a>';
+ } else {
+ $source = $ns->code;
+ }
+ }
- $this->element("twitter:source", null,
- htmlentities($this->sourceLink($notice->source)));
+ $this->element("twitter:source", null, $source);
$this->elementStart('author');
diff --git a/actions/twitapisearchjson.php b/actions/apisearchjson.php
index b5c006aa7..e44634684 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/apisearchjson.php
@@ -22,7 +22,7 @@
* @category Search
* @package StatusNet
* @author Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -31,6 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
+require_once INSTALLDIR.'/lib/apiprivateauth.php';
require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
/**
@@ -44,7 +45,7 @@ require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
* @see ApiAction
*/
-class TwitapisearchjsonAction extends ApiAction
+class ApiSearchJSONAction extends ApiPrivateAuthAction
{
var $query;
var $lang;
@@ -64,6 +65,8 @@ class TwitapisearchjsonAction extends ApiAction
function prepare($args)
{
+ common_debug("apisearchjson prepare()");
+
parent::prepare($args);
$this->query = $this->trimmed('q');
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index f7d52f020..0dfeb4812 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -29,6 +29,7 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -57,7 +58,7 @@ require_once INSTALLDIR . '/lib/apiauth.php';
class ApiStatusesDestroyAction extends ApiAuthAction
{
- var $status = null;
+ var $status = null;
/**
* Take arguments for running
@@ -99,39 +100,43 @@ class ApiStatusesDestroyAction extends ApiAuthAction
parent::handle($args);
if (!in_array($this->format, array('xml', 'json'))) {
- $this->clientError(_('API method not found.'), $code = 404);
- return;
+ $this->clientError(
+ _('API method not found.'),
+ 404
+ );
+ return;
}
- if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
- $this->clientError(_('This method requires a POST or DELETE.'),
- 400, $this->format);
- return;
- }
-
- if (empty($this->notice)) {
- $this->clientError(_('No status found with that ID.'),
- 404, $this->format);
- return;
- }
-
- if ($this->user->id == $this->notice->profile_id) {
- $replies = new Reply;
- $replies->get('notice_id', $this->notice_id);
- $replies->delete();
- $this->notice->delete();
-
- if ($this->format == 'xml') {
- $this->showSingleXmlStatus($this->notice);
- } elseif ($this->format == 'json') {
- $this->show_single_json_status($this->notice);
- }
- } else {
- $this->clientError(_('You may not delete another user\'s status.'),
- 403, $this->format);
- }
-
- $this->showNotice();
+ if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
+ $this->clientError(
+ _('This method requires a POST or DELETE.'),
+ 400,
+ $this->format
+ );
+ return;
+ }
+
+ if (empty($this->notice)) {
+ $this->clientError(
+ _('No status found with that ID.'),
+ 404, $this->format
+ );
+ return;
+ }
+
+ if ($this->user->id == $this->notice->profile_id) {
+ $replies = new Reply;
+ $replies->get('notice_id', $this->notice_id);
+ $replies->delete();
+ $this->notice->delete();
+ $this->showNotice();
+ } else {
+ $this->clientError(
+ _('You may not delete another user\'s status.'),
+ 403,
+ $this->format
+ );
+ }
}
/**
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
index 128c881e2..9aa337485 100644
--- a/actions/apistatusesretweet.php
+++ b/actions/apistatusesretweet.php
@@ -79,7 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$this->user = $this->auth_user;
- if ($this->user->id == $notice->profile_id) {
+ if ($this->user->id == $this->original->profile_id) {
$this->clientError(_('Cannot repeat your own notice.'),
400, $this->format);
return false;
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 0315d2953..476820a43 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -29,6 +29,7 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index d4ef6b550..d65a068f5 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -29,10 +29,102 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page statusesupdate statuses/update
+
+ @section Description
+ Updates the authenticating user's status. Requires the status parameter specified below.
+ Request must be a POST.
+
+ @par URL pattern
+ /api/statuses/update.:format
+
+ @par Formats (:format)
+ xml, json
+
+ @par HTTP Method(s)
+ POST
+
+ @par Requires Authentication
+ Yes
+
+ @param status (Required) The URL-encoded text of the status update.
+ @param source (Optional) The source of the status.
+ @param in_reply_to_status_id (Optional) The ID of an existing status that the update is in reply to.
+ @param lat (Optional) The latitude the status refers to.
+ @param long (Optional) The longitude the status refers to.
+ @param media (Optional) a media upload, such as an image or movie file.
+
+ @sa @ref authentication
+ @sa @ref apiroot
+
+ @subsection usagenotes Usage notes
+
+ @li The URL pattern is relative to the @ref apiroot.
+ @li If the @e source parameter is not supplied the source of the status will default to 'api'.
+ @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
+ to encode the latitude and longitude (see example response below <georss:point>).
+ @li Data uploaded via the @e media parameter should be multipart/form-data encoded.
+
+ @subsection exampleusage Example usage
+
+ @verbatim
+ curl -u username:password http://example.com/api/statuses/update.xml -d status='Howdy!' -d lat='30.468' -d long='-94.743'
+ @endverbatim
+
+ @subsection exampleresponse Example response
+
+ @verbatim
+ <?xml version="1.0" encoding="UTF-8"?>
+ <status>
+ <text>Howdy!</text>
+ <truncated>false</truncated>
+ <created_at>Tue Mar 30 23:28:05 +0000 2010</created_at>
+ <in_reply_to_status_id/>
+ <source>api</source>
+ <id>26668724</id>
+ <in_reply_to_user_id/>
+ <in_reply_to_screen_name/>
+ <geo xmlns:georss="http://www.georss.org/georss">
+ <georss:point>30.468 -94.743</georss:point>
+ </geo>
+ <favorited>false</favorited>
+ <user>
+ <id>25803</id>
+ <name>Jed Sanders</name>
+ <screen_name>jedsanders</screen_name>
+ <location>Hoop and Holler, Texas</location>
+ <description>I like to think of myself as America's Favorite.</description>
+ <profile_image_url>http://avatar.example.com/25803-48-20080924200604.png</profile_image_url>
+ <url>http://jedsanders.net</url>
+ <protected>false</protected>
+ <followers_count>5</followers_count>
+ <profile_background_color/>
+ <profile_text_color/>
+ <profile_link_color/>
+ <profile_sidebar_fill_color/>
+ <profile_sidebar_border_color/>
+ <friends_count>2</friends_count>
+ <created_at>Wed Sep 24 20:04:00 +0000 2008</created_at>
+ <favourites_count>0</favourites_count>
+ <utc_offset>0</utc_offset>
+ <time_zone>UTC</time_zone>
+ <profile_background_image_url/>
+ <profile_background_tile>false</profile_background_tile>
+ <statuses_count>70</statuses_count>
+ <following>true</following>
+ <notifications>true</notifications>
+ </user>
+ </status>
+ @endverbatim
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
@@ -64,8 +156,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
var $lat = null;
var $lon = null;
- static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-
/**
* Take arguments for running
*
@@ -80,19 +170,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction
parent::prepare($args);
$this->status = $this->trimmed('status');
- $this->source = $this->trimmed('source');
$this->lat = $this->trimmed('lat');
$this->lon = $this->trimmed('long');
- // try to set the source attr from OAuth app
- if (empty($this->source)) {
- $this->source = $this->oauth_source;
- }
-
- if (empty($this->source) || in_array($this->source, self::$reserved_sources)) {
- $this->source = 'api';
- }
-
$this->in_reply_to_status_id
= intval($this->trimmed('in_reply_to_status_id'));
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 0ba324057..63d65f289 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -206,7 +206,8 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
{
switch ($this->format) {
case 'xml':
- $this->elementStart('users', array('type' => 'array'));
+ $this->elementStart('users', array('type' => 'array',
+ 'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
foreach ($this->profiles as $profile) {
$this->showProfile(
$profile,
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 8cb2e808d..7228960c0 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -25,6 +25,7 @@
* @author Evan Prodromou <evan@status.net>
* @author Zach Copley <zach@status.net>
* @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -150,7 +151,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
@@ -185,17 +186,23 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
{
$notices = array();
+ common_debug("since id = " . $this->since_id . " max id = " . $this->max_id);
+
if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
$notice = $this->user->favoriteNotices(
+ true,
($this->page-1) * $this->count,
$this->count,
- true
+ $this->since_id,
+ $this->max_id
);
} else {
$notice = $this->user->favoriteNotices(
+ false,
($this->page-1) * $this->count,
$this->count,
- false
+ $this->since_id,
+ $this->max_id
);
}
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 7f80f252e..40ce35979 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -28,11 +28,107 @@
* @author Mike Cochrane <mikec@mikenz.geek.nz>
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page friendstimeline statuses/friends_timeline
+
+ @section Description
+ Returns the 20 most recent statuses posted by the authenticating
+ user and that user's friends. This is the equivalent of "You and
+ friends" page in the web interface.
+
+ @par URL patterns
+ @li /api/statuses/friends_timeline.:format
+ @li /api/statuses/friends_timeline/:id.:format
+
+ @par Formats (:format)
+ xml, json, rss, atom
+
+ @par ID (:id)
+ username, user id
+
+ @par HTTP Method(s)
+ GET
+
+ @par Requires Authentication
+ Sometimes (see: @ref authentication)
+
+ @param user_id (Optional) Specifies a user by ID
+ @param screen_name (Optional) Specifies a user by screename (nickname)
+ @param since_id (Optional) Returns only statuses with an ID greater
+ than (that is, more recent than) the specified ID.
+ @param max_id (Optional) Returns only statuses with an ID less than
+ (that is, older than) or equal to the specified ID.
+ @param count (Optional) Specifies the number of statuses to retrieve.
+ @param page (Optional) Specifies the page of results to retrieve.
+
+ @sa @ref authentication
+ @sa @ref apiroot
+
+ @subsection usagenotes Usage notes
+ @li The URL pattern is relative to the @ref apiroot.
+ @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
+ to encode the latitude and longitude (see example response below <georss:point>).
+
+ @subsection exampleusage Example usage
+
+ @verbatim
+ curl http://identi.ca/api/statuses/friends_timeline/evan.xml?count=1&page=2
+ @endverbatim
+
+ @subsection exampleresponse Example response
+
+ @verbatim
+ <?xml version="1.0"?>
+ <statuses type="array">
+ <status>
+ <text>back from the !yul !drupal meet with Evolving Web folk, @anarcat, @webchick and others, and an interesting refresher on SQL indexing</text>
+ <truncated>false</truncated>
+ <created_at>Wed Mar 31 01:33:02 +0000 2010</created_at>
+ <in_reply_to_status_id/>
+ <source>&lt;a href="http://code.google.com/p/microblog-purple/"&gt;mbpidgin&lt;/a&gt;</source>
+ <id>26674201</id>
+ <in_reply_to_user_id/>
+ <in_reply_to_screen_name/>
+ <geo/>
+ <favorited>false</favorited>
+ <user>
+ <id>246</id>
+ <name>Mark</name>
+ <screen_name>lambic</screen_name>
+ <location>Montreal, Canada</location>
+ <description>Geek</description>
+ <profile_image_url>http://avatar.identi.ca/246-48-20080702141545.png</profile_image_url>
+ <url>http://lambic.co.uk</url>
+ <protected>false</protected>
+ <followers_count>73</followers_count>
+ <profile_background_color>#F0F2F5</profile_background_color>
+ <profile_text_color/>
+ <profile_link_color>#002E6E</profile_link_color>
+ <profile_sidebar_fill_color>#CEE1E9</profile_sidebar_fill_color>
+ <profile_sidebar_border_color/>
+ <friends_count>58</friends_count>
+ <created_at>Wed Jul 02 14:12:15 +0000 2008</created_at>
+ <favourites_count>2</favourites_count>
+ <utc_offset>-14400</utc_offset>
+ <time_zone>US/Eastern</time_zone>
+ <profile_background_image_url/>
+ <profile_background_tile>false</profile_background_tile>
+ <statuses_count>933</statuses_count>
+ <following>false</following>
+ <notifications>false</notifications>
+ </user>
+ </status>
+ </statuses>
+ @endverbatim
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
@@ -153,7 +249,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 56d1de094..c4a6a18d2 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -105,7 +106,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
function showTimeline()
{
// We'll pull common formatting out of this for other formats
- $atom = new AtomGroupNoticeFeed($this->group);
+ $atom = new AtomGroupNoticeFeed($this->group, $this->auth_user);
$self = $this->getSelfUri();
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 43a13dcda..27eb74169 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -29,6 +29,7 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -152,7 +153,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index c3aec7c5a..ed1ad20e3 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -29,6 +29,7 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -151,7 +152,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 903461425..f90164288 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -29,6 +29,7 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -55,6 +56,95 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php';
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page publictimeline statuses/public_timeline
+
+ @section Description
+ Returns the 20 most recent notices from users throughout the system who have
+ uploaded their own avatars. Depending on configuration, it may or may not
+ not include notices from automatic posting services.
+
+ @par URL patterns
+ @li /api/statuses/public_timeline.:format
+
+ @par Formats (:format)
+ xml, json, rss, atom
+
+ @par HTTP Method(s)
+ GET
+
+ @par Requires Authentication
+ No
+
+ @param since_id (Optional) Returns only statuses with an ID greater
+ than (that is, more recent than) the specified ID.
+ @param max_id (Optional) Returns only statuses with an ID less than
+ (that is, older than) or equal to the specified ID.
+ @param count (Optional) Specifies the number of statuses to retrieve.
+ @param page (Optional) Specifies the page of results to retrieve.
+
+ @sa @ref apiroot
+
+ @subsection usagenotes Usage notes
+ @li The URL pattern is relative to the @ref apiroot.
+ @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
+ to encode the latitude and longitude (see example response below <georss:point>).
+
+ @subsection exampleusage Example usage
+
+ @verbatim
+ curl http://identi.ca/api/statuses/friends_timeline/evan.xml?count=1&page=2
+ @endverbatim
+
+ @subsection exampleresponse Example response
+
+ @verbatim
+ <?xml version="1.0" encoding="UTF-8"?>
+ <statuses type="array">
+ <status>
+ <text>@skwashd oh, commbank reenabled me super quick both times. but disconcerting when you don't expect it though</text>
+ <truncated>false</truncated>
+ <created_at>Sat Apr 17 00:49:12 +0000 2010</created_at>
+ <in_reply_to_status_id>28838393</in_reply_to_status_id>
+ <source>xmpp</source>
+ <id>28838456</id>
+ <in_reply_to_user_id>39303</in_reply_to_user_id>
+ <in_reply_to_screen_name>skwashd</in_reply_to_screen_name>
+ <geo></geo>
+ <favorited>false</favorited>
+ <user>
+ <id>44517</id>
+ <name>joshua may</name>
+ <screen_name>notjosh</screen_name>
+ <location></location>
+ <description></description>
+ <profile_image_url>http://avatar.identi.ca/44517-48-20090321004106.jpeg</profile_image_url>
+ <url></url>
+ <protected>false</protected>
+ <followers_count>17</followers_count>
+ <profile_background_color></profile_background_color>
+ <profile_text_color></profile_text_color>
+ <profile_link_color></profile_link_color>
+ <profile_sidebar_fill_color></profile_sidebar_fill_color>
+ <profile_sidebar_border_color></profile_sidebar_border_color>
+ <friends_count>20</friends_count>
+ <created_at>Sat Mar 21 00:40:25 +0000 2009</created_at>
+ <favourites_count>0</favourites_count>
+ <utc_offset>0</utc_offset>
+ <time_zone>UTC</time_zone>
+ <profile_background_image_url></profile_background_image_url>
+ <profile_background_tile>false</profile_background_tile>
+ <statuses_count>100</statuses_count>
+ <following>false</following>
+ <notifications>false</notifications>
+ </user>
+ </status>
+ [....]
+ </statuses>
+@endverbatim
+*/
+
class ApiTimelinePublicAction extends ApiPrivateAuthAction
{
@@ -130,7 +220,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index c77912fd0..ea922fc42 100644
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -117,7 +117,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index fed1437ea..c7ec172ae 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -26,6 +26,7 @@
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -138,7 +139,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 11431a82c..17a283663 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -29,6 +29,7 @@
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -115,7 +116,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
// We'll use the shared params from the Atom stub
// for other feed types.
- $atom = new AtomUserNoticeFeed($this->user);
+ $atom = new AtomUserNoticeFeed($this->user, $this->auth_user);
$link = common_local_url(
'showstream',
diff --git a/actions/twitapitrends.php b/actions/apitrends.php
index 5a04569a2..5b74636c6 100644
--- a/actions/twitapitrends.php
+++ b/actions/apitrends.php
@@ -22,7 +22,7 @@
* @category Search
* @package StatusNet
* @author Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -31,6 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
+require_once INSTALLDIR.'/lib/apiprivateauth.php';
+
/**
* Returns the top ten queries that are currently trending
*
@@ -43,7 +45,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @see ApiAction
*/
-class TwitapitrendsAction extends ApiAction
+class ApiTrendsAction extends ApiPrivateAuthAction
{
var $callback;
@@ -82,7 +84,7 @@ class TwitapitrendsAction extends ApiAction
*/
function showTrends()
{
- $this->serverError(_('API method under construction.'), $code = 501);
+ $this->serverError(_('API method under construction.'), 501);
}
} \ No newline at end of file
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 6c8fad49b..28993102c 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -113,7 +113,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
if ($this->format == 'xml') {
$this->initDocument('xml');
- $this->showTwitterXmlUser($twitter_user);
+ $this->showTwitterXmlUser($twitter_user, 'user', true);
$this->endDocument('xml');
} elseif ($this->format == 'json') {
$this->initDocument('json');
diff --git a/actions/block.php b/actions/block.php
index 11565e20c..93f8ec937 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -87,13 +87,15 @@ class BlockAction extends ProfileFormAction
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {
- $this->returnToArgs();
+ $this->returnToPrevious();
} elseif ($this->arg('yes')) {
$this->handlePost();
- $this->returnToArgs();
+ $this->returnToPrevious();
} else {
$this->showPage();
}
+ } else {
+ $this->showPage();
}
}
@@ -118,6 +120,12 @@ class BlockAction extends ProfileFormAction
*/
function areYouSureForm()
{
+ // @fixme if we ajaxify the confirmation form, skip the preview on ajax hits
+ $profile = new ArrayWrapper(array($this->profile));
+ $preview = new ProfileList($profile, $this);
+ $preview->show();
+
+
$id = $this->profile->id;
$this->elementStart('form', array('id' => 'block-' . $id,
'method' => 'post',
@@ -187,4 +195,38 @@ class BlockAction extends ProfileFormAction
$this->autofocus('form_action-yes');
}
+ /**
+ * Override for form session token checks; on our first hit we're just
+ * requesting confirmation, which doesn't need a token. We need to be
+ * able to take regular GET requests from email!
+ *
+ * @throws ClientException if token is bad on POST request or if we have
+ * confirmation parameters which could trigger something.
+ */
+ function checkSessionToken()
+ {
+ if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
+ $this->arg('yes') ||
+ $this->arg('no')) {
+
+ return parent::checkSessionToken();
+ }
+ }
+
+ /**
+ * If we reached this form without returnto arguments, return to the
+ * current user's subscription list.
+ *
+ * @return string URL
+ */
+ function defaultReturnTo()
+ {
+ $user = common_current_user();
+ if ($user) {
+ return common_local_url('subscribers',
+ array('nickname' => $user->nickname));
+ } else {
+ return common_local_url('public');
+ }
+ }
}
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index 1c1f19b0e..02ded68b3 100644
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -92,10 +92,10 @@ class DeleteuserAction extends ProfileFormAction
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {
- $this->returnToArgs();
+ $this->returnToPrevious();
} elseif ($this->arg('yes')) {
$this->handlePost();
- $this->returnToArgs();
+ $this->returnToPrevious();
} else {
$this->showPage();
}
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 8c08581b5..763737175 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -126,9 +126,19 @@ class DesignadminpanelAction extends AdminPanelAction
return;
}
- // check for an image upload
+ // check for file uploads
$bgimage = $this->saveBackgroundImage();
+ $customTheme = $this->saveCustomTheme();
+
+ $oldtheme = common_config('site', 'theme');
+ if ($customTheme) {
+ // This feels pretty hacky :D
+ $this->args['theme'] = $customTheme;
+ $themeChanged = true;
+ } else {
+ $themeChanged = ($this->trimmed('theme') != $oldtheme);
+ }
static $settings = array('theme', 'logo');
@@ -140,15 +150,13 @@ class DesignadminpanelAction extends AdminPanelAction
$this->validate($values);
- $oldtheme = common_config('site', 'theme');
-
$config = new Config();
$config->query('BEGIN');
// Only update colors if the theme has not changed.
- if ($oldtheme == $values['theme']) {
+ if (!$themeChanged) {
$bgcolor = new WebColor($this->trimmed('design_background'));
$ccolor = new WebColor($this->trimmed('design_content'));
@@ -190,6 +198,13 @@ class DesignadminpanelAction extends AdminPanelAction
Config::save('design', 'backgroundimage', $bgimage);
}
+ if (common_config('custom_css', 'enabled')) {
+ $css = $this->arg('css');
+ if ($css != common_config('custom_css', 'css')) {
+ Config::save('custom_css', 'css', $css);
+ }
+ }
+
$config->query('COMMIT');
}
@@ -264,6 +279,33 @@ class DesignadminpanelAction extends AdminPanelAction
}
/**
+ * Save the custom theme if the user uploaded one.
+ *
+ * @return mixed custom theme name, if succesful, or null if no theme upload.
+ * @throws ClientException for invalid theme archives
+ * @throws ServerException if trouble saving the theme files
+ */
+
+ function saveCustomTheme()
+ {
+ if (common_config('theme_upload', 'enabled') &&
+ $_FILES['design_upload_theme']['error'] == UPLOAD_ERR_OK) {
+
+ $upload = ThemeUploader::fromUpload('design_upload_theme');
+ $basedir = common_config('local', 'dir');
+ if (empty($basedir)) {
+ $basedir = INSTALLDIR . '/local';
+ }
+ $name = 'custom'; // @todo allow multiples, custom naming?
+ $outdir = $basedir . '/theme/' . $name;
+ $upload->extract($outdir);
+ return $name;
+ } else {
+ return null;
+ }
+ }
+
+ /**
* Attempt to validate setting values
*
* @return void
@@ -371,7 +413,15 @@ class DesignAdminPanelForm extends AdminForm
function formData()
{
+ $this->showLogo();
+ $this->showTheme();
+ $this->showBackground();
+ $this->showColors();
+ $this->showAdvanced();
+ }
+ function showLogo()
+ {
$this->out->elementStart('fieldset', array('id' => 'settings_design_logo'));
$this->out->element('legend', null, _('Change logo'));
@@ -384,6 +434,11 @@ class DesignAdminPanelForm extends AdminForm
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
+
+ }
+
+ function showTheme()
+ {
$this->out->elementStart('fieldset', array('id' => 'settings_design_theme'));
$this->out->element('legend', null, _('Change theme'));
@@ -407,10 +462,23 @@ class DesignAdminPanelForm extends AdminForm
false, $this->value('theme'));
$this->unli();
+ if (common_config('theme_upload', 'enabled')) {
+ $this->li();
+ $this->out->element('label', array('for' => 'design_upload_theme'), _('Custom theme'));
+ $this->out->element('input', array('id' => 'design_upload_theme',
+ 'name' => 'design_upload_theme',
+ 'type' => 'file'));
+ $this->out->element('p', 'form_guide', _('You can upload a custom StatusNet theme as a .ZIP archive.'));
+ $this->unli();
+ }
+
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
+ }
+ function showBackground()
+ {
$design = $this->out->design;
$this->out->elementStart('fieldset', array('id' =>
@@ -486,6 +554,11 @@ class DesignAdminPanelForm extends AdminForm
$this->out->elementEnd('ul');
$this->out->elementEnd('fieldset');
+ }
+
+ function showColors()
+ {
+ $design = $this->out->design;
$this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
$this->out->element('legend', null, _('Change colours'));
@@ -493,6 +566,7 @@ class DesignAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data');
try {
+ // @fixme avoid loop unrolling in non-performance-critical contexts like this
$bgcolor = new WebColor($design->backgroundcolor);
@@ -560,6 +634,7 @@ class DesignAdminPanelForm extends AdminForm
$this->unli();
} catch (WebColorException $e) {
+ // @fixme normalize them individually!
common_log(LOG_ERR, 'Bad color values in site design: ' .
$e->getMessage());
}
@@ -569,6 +644,27 @@ class DesignAdminPanelForm extends AdminForm
$this->out->elementEnd('ul');
}
+ function showAdvanced()
+ {
+ if (common_config('custom_css', 'enabled')) {
+ $this->out->elementStart('fieldset', array('id' => 'settings_design_advanced'));
+ $this->out->element('legend', null, _('Advanced'));
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+ $this->out->element('label', array('for' => 'css'), _('Custom CSS'));
+ $this->out->element('textarea', array('name' => 'css',
+ 'id' => 'css',
+ 'cols' => '50',
+ 'rows' => '10'),
+ strval(common_config('custom_css', 'css')));
+ $this->unli();
+
+ $this->out->elementEnd('fieldset');
+ $this->out->elementEnd('ul');
+ }
+ }
+
/**
* Action elements
*
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 62f06e841..51c92af93 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -89,7 +89,7 @@ class FavoritesrssAction extends Rss10Action
function getNotices($limit=0)
{
$user = $this->user;
- $notice = $user->favoriteNotices(0, $limit);
+ $notice = $user->favoriteNotices(false, 0, $limit);
$notices = array();
while ($notice->fetch()) {
$notices[] = clone($notice);
diff --git a/actions/foaf.php b/actions/foaf.php
index 9cb65a885..09af7b502 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -95,7 +95,9 @@ class FoafAction extends Action
// Would be nice to tell if they were a Person or not (e.g. a #person usertag?)
$this->elementStart('Agent', array('rdf:about' =>
$this->user->uri));
- $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email));
+ if ($this->user->email) {
+ $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email));
+ }
if ($this->profile->fullname) {
$this->element('name', null, $this->profile->fullname);
}
@@ -152,7 +154,9 @@ class FoafAction extends Action
}
$person = $this->showMicrobloggingAccount($this->profile,
- common_root_url(), $this->user->uri, false);
+ common_root_url(), $this->user->uri,
+ /*$fetchSubscriptions*/true,
+ /*$isSubscriber*/false);
// Get people who subscribe to user
@@ -207,7 +211,8 @@ class FoafAction extends Action
$this->showMicrobloggingAccount($profile,
($local == 'local') ? common_root_url() : null,
$uri,
- true);
+ /*$fetchSubscriptions*/false,
+ /*$isSubscriber*/($type == LISTENER || $type == BOTH));
if ($foaf_url) {
$this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url));
}
@@ -232,7 +237,21 @@ class FoafAction extends Action
$this->elementEnd('PersonalProfileDocument');
}
- function showMicrobloggingAccount($profile, $service=null, $useruri=null, $isSubscriber=false)
+ /**
+ * Output FOAF <account> bit for the given profile.
+ *
+ * @param Profile $profile
+ * @param mixed $service Root URL of this StatusNet instance for a local
+ * user, otherwise null.
+ * @param mixed $useruri URI string for the referenced profile..
+ * @param boolean $fetchSubscriptions Should we load and list all their subscriptions?
+ * @param boolean $isSubscriber if not fetching subs, we can still mark the user as following the current page.
+ *
+ * @return array if $fetchSubscribers is set, return a list of info on those
+ * subscriptions.
+ */
+
+ function showMicrobloggingAccount($profile, $service=null, $useruri=null, $fetchSubscriptions=false, $isSubscriber=false)
{
$attr = array();
if ($useruri) {
@@ -254,9 +273,7 @@ class FoafAction extends Action
$person = array();
- if ($isSubscriber) {
- $this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
- } else {
+ if ($fetchSubscriptions) {
// Get people user is subscribed to
$sub = new Subscription();
$sub->subscriber = $profile->id;
@@ -281,6 +298,9 @@ class FoafAction extends Action
}
unset($sub);
+ } else if ($isSubscriber) {
+ // Just declare that they follow the user whose FOAF we're showing.
+ $this->element('sioc:follows', array('rdf:resource' => $this->user->uri . '#acct'));
}
$this->elementEnd('OnlineAccount');
diff --git a/actions/geocode.php b/actions/geocode.php
index e883c6ce4..d93493060 100644
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -37,6 +37,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @category Action
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
*/
diff --git a/actions/groupblock.php b/actions/groupblock.php
index e52db6e11..39f783397 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -117,7 +117,7 @@ class GroupblockAction extends RedirectingAction
parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {
- $this->returnToArgs();
+ $this->returnToPrevious();
} elseif ($this->arg('yes')) {
$this->blockProfile();
} elseif ($this->arg('blockto')) {
@@ -207,7 +207,7 @@ class GroupblockAction extends RedirectingAction
return false;
}
- $this->returnToArgs();
+ $this->returnToPrevious();
}
/**
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 2c2606b76..662b1063e 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -133,8 +133,7 @@ class ImsettingsAction extends ConnectSettingsAction
'message with further instructions. '.
'(Did you add %s to your buddy list?)'),
$transport_info['display'],
- $transport_info['daemon_screenname'],
- jabber_daemon_address()));
+ $transport_info['daemon_screenname']));
$this->hidden('screenname', $confirm->address);
// TRANS: Button label to cancel an IM address confirmation procedure.
$this->submit('cancel', _m('BUTTON','Cancel'));
@@ -163,12 +162,11 @@ class ImsettingsAction extends ConnectSettingsAction
'action' =>
common_local_url('imsettings')));
$this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
- $this->element('legend', null, _('Preferences'));
+ // TRANS: Header for IM preferences form.
+ $this->element('legend', null, _('IM Preferences'));
$this->hidden('token', common_session_token());
$this->elementStart('table');
$this->elementStart('tr');
- // TRANS: Header for IM preferences form.
- $this->element('th', null, _('IM Preferences'));
foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs)
{
$this->element('th', null, $transports[$transport]['display']);
@@ -278,19 +276,20 @@ class ImsettingsAction extends ConnectSettingsAction
$user = common_current_user();
$user_im_prefs = new User_im_prefs();
+ $user_im_prefs->query('BEGIN');
$user_im_prefs->user_id = $user->id;
if($user_im_prefs->find() && $user_im_prefs->fetch())
{
$preferences = array('notify', 'updatefrompresence', 'replies', 'microid');
- $user_im_prefs->query('BEGIN');
do
{
$original = clone($user_im_prefs);
+ $new = clone($user_im_prefs);
foreach($preferences as $preference)
{
- $user_im_prefs->$preference = $this->boolean($user_im_prefs->transport . '_' . $preference);
+ $new->$preference = $this->boolean($new->transport . '_' . $preference);
}
- $result = $user_im_prefs->update($original);
+ $result = $new->update($original);
if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
@@ -299,8 +298,8 @@ class ImsettingsAction extends ConnectSettingsAction
return;
}
}while($user_im_prefs->fetch());
- $user_im_prefs->query('COMMIT');
}
+ $user_im_prefs->query('COMMIT');
// TRANS: Confirmation message for successful IM preferences save.
$this->showForm(_('Preferences saved.'), true);
}
diff --git a/actions/login.php b/actions/login.php
index 8ea3c800b..d3e4312f7 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -63,6 +63,28 @@ class LoginAction extends Action
}
/**
+ * Prepare page to run
+ *
+ *
+ * @param $args
+ * @return string title
+ */
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ // @todo this check should really be in index.php for all sensitive actions
+ $ssl = common_config('site', 'ssl');
+ if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
+ common_redirect(common_local_url('login'));
+ // exit
+ }
+
+ return true;
+ }
+
+ /**
* Handle input, produce output
*
* Switches on request method; either shows the form or handles its input.
@@ -267,9 +289,13 @@ class LoginAction extends Action
'user name and password ' .
'before changing your settings.');
} else {
- return _('Login with your username and password. ' .
- 'Don\'t have a username yet? ' .
- '[Register](%%action.register%%) a new account.');
+ $prompt = _('Login with your username and password.');
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+ $prompt .= ' ';
+ $prompt .= _('Don\'t have a username yet? ' .
+ '[Register](%%action.register%%) a new account.');
+ }
+ return $prompt;
}
}
diff --git a/actions/oembed.php b/actions/oembed.php
index 1503aa9c2..e25e4cb25 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -23,6 +23,7 @@
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2008 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 5fd4eead7..8f0337e4f 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -8,7 +8,9 @@
* @category Action
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
+ * @author Craig Andrews <candrews@integralblue.com>
* @author Robin Millette <millette@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
*
@@ -44,6 +46,7 @@ require_once INSTALLDIR.'/lib/xrdsoutputter.php';
* @author Evan Prodromou <evan@status.net>
* @author Robin Millette <millette@status.net>
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
*
diff --git a/actions/register.php b/actions/register.php
index d1bc381fb..7307bc689 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -74,6 +74,13 @@ class RegisterAction extends Action
parent::prepare($args);
$this->code = $this->trimmed('code');
+ // @todo this check should really be in index.php for all sensitive actions
+ $ssl = common_config('site', 'ssl');
+ if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
+ common_redirect(common_local_url('register'));
+ // exit
+ }
+
if (empty($this->code)) {
common_ensure_session();
if (array_key_exists('invitecode', $_SESSION)) {
@@ -491,6 +498,45 @@ class RegisterAction extends Action
$this->elementStart('li');
$this->element('input', $attrs);
$this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
+ $this->raw($this->licenseCheckbox());
+ $this->elementEnd('label');
+ $this->elementEnd('li');
+ }
+ $this->elementEnd('ul');
+ $this->submit('submit', _('Register'));
+ $this->elementEnd('fieldset');
+ $this->elementEnd('form');
+ }
+
+ function licenseCheckbox()
+ {
+ $out = '';
+ switch (common_config('license', 'type')) {
+ case 'private':
+ // TRANS: Copyright checkbox label in registration dialog, for private sites.
+ $out .= htmlspecialchars(sprintf(
+ _('I understand that content and data of %1$s are private and confidential.'),
+ common_config('site', 'name')));
+ // fall through
+ case 'allrightsreserved':
+ if ($out != '') {
+ $out .= ' ';
+ }
+ if (common_config('license', 'owner')) {
+ // TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
+ $out .= htmlspecialchars(sprintf(
+ _('My text and files are copyright by %1$s.'),
+ common_config('license', 'owner')));
+ } else {
+ // TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+ $out .= htmlspecialchars(_('My text and files remain under my own copyright.'));
+ }
+ // TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+ $out .= ' ' . _('All rights reserved.');
+ break;
+ case 'cc': // fall through
+ default:
+ // TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
$message = _('My text and files are available under %s ' .
'except this private data: password, ' .
'email address, IM address, and phone number.');
@@ -499,14 +545,9 @@ class RegisterAction extends Action
'">' .
htmlspecialchars(common_config('license', 'title')) .
'</a>';
- $this->raw(sprintf(htmlspecialchars($message), $link));
- $this->elementEnd('label');
- $this->elementEnd('li');
+ $out .= sprintf(htmlspecialchars($message), $link);
}
- $this->elementEnd('ul');
- $this->submit('submit', _('Register'));
- $this->elementEnd('fieldset');
- $this->elementEnd('form');
+ return $out;
}
/**
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 4d776ef04..7f3c77ee2 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -121,11 +121,11 @@ class ShowfavoritesAction extends OwnerDesignAction
// Show imported/gateway notices as well as local if
// the user is looking at his own favorites
- $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1, true);
+ $this->notice = $this->user->favoriteNotices(true, ($this->page-1)*NOTICES_PER_PAGE,
+ NOTICES_PER_PAGE + 1);
} else {
- $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1, false);
+ $this->notice = $this->user->favoriteNotices(false, ($this->page-1)*NOTICES_PER_PAGE,
+ NOTICES_PER_PAGE + 1);
}
if (empty($this->notice)) {
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 3d369e9eb..17c37e4d7 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -430,14 +430,6 @@ class ShowgroupAction extends GroupDesignAction
function showStatistics()
{
- // XXX: WORM cache this
- $members = $this->group->getMembers();
- $members_count = 0;
- /** $member->count() doesn't work. */
- while ($members->fetch()) {
- $members_count++;
- }
-
$this->elementStart('div', array('id' => 'entity_statistics',
'class' => 'section'));
@@ -451,7 +443,7 @@ class ShowgroupAction extends GroupDesignAction
$this->elementStart('dl', 'entity_members');
$this->element('dt', null, _('Members'));
- $this->element('dd', null, (is_int($members_count)) ? $members_count : '0');
+ $this->element('dd', null, $this->group->getMemberCount());
$this->elementEnd('dl');
$this->elementEnd('div');
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 7b10b3425..da563a218 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -185,7 +185,9 @@ class SubscriptionsListItem extends SubscriptionListItem
return;
}
- if (!common_config('xmpp', 'enabled') && !common_config('sms', 'enabled')) {
+ $transports = array();
+ Event::handle('GetImTransports', array(&$transports));
+ if (!$transports && !common_config('sms', 'enabled')) {
return;
}
@@ -195,7 +197,7 @@ class SubscriptionsListItem extends SubscriptionListItem
'action' => common_local_url('subedit')));
$this->out->hidden('token', common_session_token());
$this->out->hidden('profile', $this->profile->id);
- if (common_config('xmpp', 'enabled')) {
+ if ($transports) {
$attrs = array('name' => 'jabber',
'type' => 'checkbox',
'class' => 'checkbox',
@@ -205,7 +207,7 @@ class SubscriptionsListItem extends SubscriptionListItem
}
$this->out->element('input', $attrs);
- $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber'));
+ $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('IM'));
} else {
$this->out->hidden('jabber', $sub->jabber);
}
diff --git a/actions/version.php b/actions/version.php
index b6593e5ed..9e4e836d2 100644
--- a/actions/version.php
+++ b/actions/version.php
@@ -41,6 +41,8 @@ if (!defined('STATUSNET')) {
* @category Info
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
* @link http://status.net/
*/
diff --git a/avatar/.gitignore b/avatar/.gitignore
index e69de29bb..e69de29bb 100644..100755
--- a/avatar/.gitignore
+++ b/avatar/.gitignore
diff --git a/classes/Fave.php b/classes/Fave.php
index 7ca9ade7f..ed4f56aee 100644
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -75,13 +75,13 @@ class Fave extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('Fave', $kv);
}
- function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false)
+ function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0)
{
$ids = Notice::stream(array('Fave', '_streamDirect'),
array($user_id, $own),
($own) ? 'fave:ids_by_user_own:'.$user_id :
'fave:ids_by_user:'.$user_id,
- $offset, $limit);
+ $offset, $limit, $since_id, $max_id);
return $ids;
}
diff --git a/classes/File.php b/classes/File.php
index c9477f5f1..0cd31075d 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -116,7 +116,11 @@ class File extends Memcached_DataObject
return false;
}
- function processNew($given_url, $notice_id=null) {
+ /**
+ * @fixme refactor this mess, it's gotten pretty scary.
+ * @param bool $followRedirects
+ */
+ function processNew($given_url, $notice_id=null, $followRedirects=true) {
if (empty($given_url)) return -1; // error, no url to process
$given_url = File_redirection::_canonUrl($given_url);
if (empty($given_url)) return -1; // error, no url to process
@@ -124,6 +128,10 @@ class File extends Memcached_DataObject
if (empty($file)) {
$file_redir = File_redirection::staticGet('url', $given_url);
if (empty($file_redir)) {
+ // @fixme for new URLs this also looks up non-redirect data
+ // such as target content type, size, etc, which we need
+ // for File::saveNew(); so we call it even if not following
+ // new redirects.
$redir_data = File_redirection::where($given_url);
if (is_array($redir_data)) {
$redir_url = $redir_data['url'];
@@ -134,11 +142,19 @@ class File extends Memcached_DataObject
throw new ServerException("Can't process url '$given_url'");
}
// TODO: max field length
- if ($redir_url === $given_url || strlen($redir_url) > 255) {
+ if ($redir_url === $given_url || strlen($redir_url) > 255 || !$followRedirects) {
$x = File::saveNew($redir_data, $given_url);
$file_id = $x->id;
} else {
- $x = File::processNew($redir_url, $notice_id);
+ // This seems kind of messed up... for now skipping this part
+ // if we're already under a redirect, so we don't go into
+ // horrible infinite loops if we've been given an unstable
+ // redirect (where the final destination of the first request
+ // doesn't match what we get when we ask for it again).
+ //
+ // Seen in the wild with clojure.org, which redirects through
+ // wikispaces for auth and appends session data in the URL params.
+ $x = File::processNew($redir_url, $notice_id, /*followRedirects*/false);
$file_id = $x->id;
File_redirection::saveNew($redir_data, $file_id, $given_url);
}
diff --git a/classes/Inbox.php b/classes/Inbox.php
index 2533210b7..430419ba5 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -115,9 +115,12 @@ class Inbox extends Memcached_DataObject
*/
static function insertNotice($user_id, $notice_id)
{
- $inbox = DB_DataObject::staticGet('inbox', 'user_id', $user_id);
-
- if (empty($inbox)) {
+ // Going straight to the DB rather than trusting our caching
+ // during an update. Note: not using DB_DataObject::staticGet,
+ // which is unsafe to use directly (in-process caching causes
+ // memory leaks, which accumulate in queue processes).
+ $inbox = new Inbox();
+ if (!$inbox->get('user_id', $user_id)) {
$inbox = Inbox::initialize($user_id);
}
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 85273a9b7..747c22ebb 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -128,12 +128,13 @@ class Memcached_DataObject extends Safe_DataObject
}
static function cacheKey($cls, $k, $v) {
- if (is_object($cls) || is_object($k) || is_object($v)) {
+ if (is_object($cls) || is_object($k) || (is_object($v) && !($v instanceof DB_DataObject_Cast))) {
$e = new Exception();
common_log(LOG_ERR, __METHOD__ . ' object in param: ' .
str_replace("\n", " ", $e->getTraceAsString()));
}
- return common_cache_key(strtolower($cls).':'.$k.':'.$v);
+ $vstr = self::valueString($v);
+ return common_cache_key(strtolower($cls).':'.$k.':'.$vstr);
}
static function getcached($cls, $k, $v) {
@@ -229,10 +230,10 @@ class Memcached_DataObject extends Safe_DataObject
if (empty($this->$key)) {
continue;
}
- $ckeys[] = $this->cacheKey($this->tableName(), $key, $this->$key);
+ $ckeys[] = $this->cacheKey($this->tableName(), $key, self::valueString($this->$key));
} else if ($type == 'K' || $type == 'N') {
$pkey[] = $key;
- $pval[] = $this->$key;
+ $pval[] = self::valueString($this->$key);
} else {
throw new Exception("Unknown key type $key => $type for " . $this->tableName());
}
@@ -351,7 +352,7 @@ class Memcached_DataObject extends Safe_DataObject
* low-level database function and add a comment to the
* query string. This should then be visible in process lists
* and slow query logs, to help identify problem areas.
- *
+ *
* Also marks whether this was a web GET/POST or which daemon
* was running it.
*
@@ -604,5 +605,30 @@ class Memcached_DataObject extends Safe_DataObject
return $c->set($cacheKey, $value);
}
+
+ static function valueString($v)
+ {
+ $vstr = null;
+ if (is_object($v) && $v instanceof DB_DataObject_Cast) {
+ switch ($v->type) {
+ case 'date':
+ $vstr = $v->year . '-' . $v->month . '-' . $v->day;
+ break;
+ case 'blob':
+ case 'string':
+ case 'sql':
+ case 'datetime':
+ case 'time':
+ throw new ServerException("Unhandled DB_DataObject_Cast type passed as cacheKey value: '$v->type'");
+ break;
+ default:
+ throw new ServerException("Unknown DB_DataObject_Cast type passed as cacheKey value: '$v->type'");
+ break;
+ }
+ } else {
+ $vstr = strval($v);
+ }
+ return $vstr;
+ }
}
diff --git a/classes/Notice.php b/classes/Notice.php
index d65f0da9a..482bc550b 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -29,6 +29,7 @@
* @author Robin Millette <millette@controlyourself.ca>
* @author Sarven Capadisli <csarven@controlyourself.ca>
* @author Tom Adams <tom@holizz.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license GNU Affero General Public License http://www.gnu.org/licenses/
*/
@@ -97,15 +98,20 @@ class Notice extends Memcached_DataObject
// For auditing purposes, save a record that the notice
// was deleted.
- $deleted = new Deleted_notice();
+ // @fixme we have some cases where things get re-run and so the
+ // insert fails.
+ $deleted = Deleted_notice::staticGet('id', $this->id);
+ if (!$deleted) {
+ $deleted = new Deleted_notice();
- $deleted->id = $this->id;
- $deleted->profile_id = $this->profile_id;
- $deleted->uri = $this->uri;
- $deleted->created = $this->created;
- $deleted->deleted = common_sql_now();
+ $deleted->id = $this->id;
+ $deleted->profile_id = $this->profile_id;
+ $deleted->uri = $this->uri;
+ $deleted->created = $this->created;
+ $deleted->deleted = common_sql_now();
- $deleted->insert();
+ $deleted->insert();
+ }
// Clear related records
@@ -704,7 +710,7 @@ class Notice extends Memcached_DataObject
/**
* Is this notice part of an active conversation?
- *
+ *
* @return boolean true if other messages exist in the same
* conversation, false if this is the only one
*/
@@ -981,8 +987,7 @@ class Notice extends Memcached_DataObject
* messages, we won't deliver to any remote targets as that's the
* source service's responsibility.
*
- * @fixme Unlike saveReplies() there's no mail notification here.
- * Move that to distrib queue handler?
+ * Mail notifications etc will be handled later.
*
* @param array of unique identifier URIs for recipients
*/
@@ -1008,8 +1013,6 @@ class Notice extends Memcached_DataObject
$reply->profile_id = $user->id;
$id = $reply->insert();
-
- self::blow('reply:stream:%d', $user->id);
}
}
@@ -1021,8 +1024,7 @@ class Notice extends Memcached_DataObject
* and save reply records indicating that this message needs to be
* delivered to those users.
*
- * Side effect: local recipients get e-mail notifications here.
- * @fixme move mail notifications to distrib?
+ * Mail notifications to local profiles will be sent later.
*
* @return array of integer profile IDs
*/
@@ -1076,23 +1078,21 @@ class Notice extends Memcached_DataObject
throw new ServerException("Couldn't save reply for {$this->id}, {$mentioned->id}");
} else {
$replied[$mentioned->id] = 1;
+ self::blow('reply:stream:%d', $mentioned->id);
}
}
}
$recipientIds = array_keys($replied);
- foreach ($recipientIds as $recipientId) {
- $user = User::staticGet('id', $recipientId);
- if (!empty($user)) {
- self::blow('reply:stream:%d', $reply->profile_id);
- mail_notify_attn($user, $this);
- }
- }
-
return $recipientIds;
}
+ /**
+ * Pull the complete list of @-reply targets for this notice.
+ *
+ * @return array of integer profile ids
+ */
function getReplies()
{
// XXX: cache me
@@ -1116,6 +1116,30 @@ class Notice extends Memcached_DataObject
}
/**
+ * Send e-mail notifications to local @-reply targets.
+ *
+ * Replies must already have been saved; this is expected to be run
+ * from the distrib queue handler.
+ */
+ function sendReplyNotifications()
+ {
+ // Don't send reply notifications for repeats
+
+ if (!empty($this->repeat_of)) {
+ return array();
+ }
+
+ $recipientIds = $this->getReplies();
+
+ foreach ($recipientIds as $recipientId) {
+ $user = User::staticGet('id', $recipientId);
+ if (!empty($user)) {
+ mail_notify_attn($user, $this);
+ }
+ }
+ }
+
+ /**
* Pull list of groups this notice needs to be delivered to,
* as previously recorded by saveGroups() or saveKnownGroups().
*
@@ -1154,7 +1178,7 @@ class Notice extends Memcached_DataObject
return $groups;
}
- function asAtomEntry($namespace=false, $source=false, $author=true)
+ function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null)
{
$profile = $this->getProfile();
@@ -1167,7 +1191,8 @@ class Notice extends Memcached_DataObject
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
'xmlns:media' => 'http://purl.org/syndication/atommedia',
'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
- 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0');
+ 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
+ 'xmlns:statusnet' => 'http://status.net/schema/api/1/');
} else {
$attrs = array();
}
@@ -1202,7 +1227,7 @@ class Notice extends Memcached_DataObject
$xs->element('title', null, common_xml_safe_str($this->content));
if ($author) {
- $xs->raw($profile->asAtomAuthor());
+ $xs->raw($profile->asAtomAuthor($cur));
$xs->raw($profile->asActivityActor());
}
@@ -1215,6 +1240,46 @@ class Notice extends Memcached_DataObject
$xs->element('published', null, common_date_w3dtf($this->created));
$xs->element('updated', null, common_date_w3dtf($this->created));
+ $source = null;
+
+ $ns = $this->getSource();
+
+ if ($ns) {
+ if (!empty($ns->name) && !empty($ns->url)) {
+ $source = '<a href="'
+ . htmlspecialchars($ns->url)
+ . '" rel="nofollow">'
+ . htmlspecialchars($ns->name)
+ . '</a>';
+ } else {
+ $source = $ns->code;
+ }
+ }
+
+ $noticeInfoAttr = array(
+ 'local_id' => $this->id, // local notice ID (useful to clients for ordering)
+ 'source' => $source, // the client name (source attribution)
+ );
+
+ $ns = $this->getSource();
+ if ($ns) {
+ if (!empty($ns->url)) {
+ $noticeInfoAttr['source_link'] = $ns->url;
+ }
+ }
+
+ if (!empty($cur)) {
+ $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false";
+ $profile = $cur->getProfile();
+ $noticeInfoAttr['repeated'] = ($profile->hasRepeated($this->id)) ? "true" : "false";
+ }
+
+ if (!empty($this->repeat_of)) {
+ $noticeInfoAttr['repeat_of'] = $this->repeat_of;
+ }
+
+ $xs->element('statusnet:notice_info', $noticeInfoAttr, null);
+
if ($this->reply_to) {
$reply_notice = Notice::staticGet('id', $this->reply_to);
if (!empty($reply_notice)) {
@@ -1781,4 +1846,53 @@ class Notice extends Memcached_DataObject
return $result;
}
+
+ /**
+ * Get the source of the notice
+ *
+ * @return Notice_source $ns A notice source object. 'code' is the only attribute
+ * guaranteed to be populated.
+ */
+ function getSource()
+ {
+ $ns = new Notice_source();
+ if (!empty($this->source)) {
+ switch ($this->source) {
+ case 'web':
+ case 'xmpp':
+ case 'mail':
+ case 'omb':
+ case 'system':
+ case 'api':
+ $ns->code = $this->source;
+ break;
+ default:
+ $ns = Notice_source::staticGet($this->source);
+ if (!$ns) {
+ $ns = new Notice_source();
+ $ns->code = $this->source;
+ $app = Oauth_application::staticGet('name', $this->source);
+ if ($app) {
+ $ns->name = $app->name;
+ $ns->url = $app->source_url;
+ }
+ }
+ break;
+ }
+ }
+ return $ns;
+ }
+
+ /**
+ * Determine whether the notice was locally created
+ *
+ * @return boolean locality
+ */
+
+ public function isLocal()
+ {
+ return ($this->is_local == Notice::LOCAL_PUBLIC ||
+ $this->is_local == Notice::LOCAL_NONPUBLIC);
+ }
+
}
diff --git a/classes/Profile.php b/classes/Profile.php
index 54f557ea7..a303469e9 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -849,15 +849,23 @@ class Profile extends Memcached_DataObject
*
* Assumes that Atom has been previously set up as the base namespace.
*
+ * @param Profile $cur the current authenticated user
+ *
* @return string
*/
- function asAtomAuthor()
+ function asAtomAuthor($cur = null)
{
$xs = new XMLStringer(true);
$xs->elementStart('author');
$xs->element('name', null, $this->nickname);
$xs->element('uri', null, $this->getUri());
+ if ($cur != null) {
+ $attrs = Array();
+ $attrs['following'] = $cur->isSubscribed($this) ? 'true' : 'false';
+ $attrs['blocking'] = $cur->hasBlocked($this) ? 'true' : 'false';
+ $xs->element('statusnet:profile_info', $attrs, null);
+ }
$xs->elementEnd('author');
return $xs->getString();
diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index f83c2cef1..c7e17be6e 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -64,4 +64,17 @@ class Queue_item extends Memcached_DataObject
$qi = null;
return null;
}
+
+ /**
+ * Release a claimed item.
+ */
+ function releaseCLaim()
+ {
+ // DB_DataObject doesn't let us save nulls right now
+ $sql = sprintf("UPDATE queue_item SET claimed=NULL WHERE id=%d", $this->id);
+ $this->query($sql);
+
+ $this->claimed = null;
+ $this->encache();
+ }
}
diff --git a/classes/Reply.php b/classes/Reply.php
index 659e04c92..dc6296bda 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -22,6 +22,20 @@ class Reply extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
+ /**
+ * Wrapper for record insertion to update related caches
+ */
+ function insert()
+ {
+ $result = parent::insert();
+
+ if ($result) {
+ self::blow('reply:stream:%d', $this->profile_id);
+ }
+
+ return $result;
+ }
+
function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
{
$ids = Notice::stream(array('Reply', '_streamDirect'),
diff --git a/classes/Status_network.php b/classes/Status_network.php
index a452c32ce..64016dd79 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -144,26 +144,49 @@ class Status_network extends Safe_DataObject
return parent::update($orig);
}
+ /**
+ * DB_DataObject doesn't allow updating keys (even non-primary)
+ */
+ function updateKeys(&$orig)
+ {
+ $this->_connect();
+ foreach (array('hostname', 'pathname') as $k) {
+ if (strcmp($this->$k, $orig->$k) != 0) {
+ $parts[] = $k . ' = ' . $this->_quote($this->$k);
+ }
+ }
+ if (count($parts) == 0) {
+ // No changes
+ return true;
+ }
+
+ $toupdate = implode(', ', $parts);
+
+ $table = common_database_tablename($this->tableName());
+ $qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
+ ' WHERE nickname = ' . $this->_quote($this->nickname);
+ $orig->decache();
+ $result = $this->query($qry);
+ if ($result) {
+ $this->encache();
+ }
+ return $result;
+ }
+
function delete()
{
$this->decache(); # while we still have the values!
return parent::delete();
}
-
+
/**
* @param string $servername hostname
- * @param string $pathname URL base path
* @param string $wildcard hostname suffix to match wildcard config
+ * @return mixed Status_network or null
*/
- static function setupSite($servername, $pathname, $wildcard)
+ static function getFromHostname($servername, $wildcard)
{
- global $config;
-
$sn = null;
-
- // XXX I18N, probably not crucial for hostnames
- // XXX This probably needs a tune up
-
if (0 == strncasecmp(strrev($wildcard), strrev($servername), strlen($wildcard))) {
// special case for exact match
if (0 == strcasecmp($servername, $wildcard)) {
@@ -182,6 +205,23 @@ class Status_network extends Safe_DataObject
}
}
}
+ return $sn;
+ }
+
+ /**
+ * @param string $servername hostname
+ * @param string $pathname URL base path
+ * @param string $wildcard hostname suffix to match wildcard config
+ */
+ static function setupSite($servername, $pathname, $wildcard)
+ {
+ global $config;
+
+ $sn = null;
+
+ // XXX I18N, probably not crucial for hostnames
+ // XXX This probably needs a tune up
+ $sn = self::getFromHostname($servername, $wildcard);
if (!empty($sn)) {
diff --git a/classes/User.php b/classes/User.php
index 4626a7ca1..314b80531 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -459,9 +459,9 @@ class User extends Memcached_DataObject
return $profile->getNotices($offset, $limit, $since_id, $before_id);
}
- function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false)
+ function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
{
- $ids = Fave::stream($this->id, $offset, $limit, $own);
+ $ids = Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id);
return Notice::getStreamByIds($ids);
}
diff --git a/classes/User_group.php b/classes/User_group.php
index 110f08301..e04c46626 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -154,6 +154,21 @@ class User_group extends Memcached_DataObject
return $members;
}
+ function getMemberCount()
+ {
+ // XXX: WORM cache this
+
+ $members = $this->getMembers();
+ $member_count = 0;
+
+ /** $member->count() doesn't work. */
+ while ($members->fetch()) {
+ $member_count++;
+ }
+
+ return $member_count;
+ }
+
function getAdmins($offset=0, $limit=null)
{
$qry =
diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 8ecdfe9fa..75be8969e 100644
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -68,4 +68,27 @@ class User_im_prefs extends Memcached_DataObject
{
return array(false,false);
}
+
+ /**
+ * We have two compound keys with unique constraints:
+ * (transport, user_id) which is our primary key, and
+ * (transport, screenname) which is an additional constraint.
+ *
+ * Currently there's not a way to represent that second key
+ * in the general keys list, so we're adding it here to the
+ * list of keys to use for caching, ensuring that it gets
+ * cleared as well when we change.
+ *
+ * @return array of cache keys
+ */
+ function _allCacheKeys()
+ {
+ $ukeys = 'transport,screenname';
+ $uvals = $this->transport . ',' . $this->screenname;
+
+ $ckeys = parent::_allCacheKeys();
+ $ckeys[] = $this->cacheKey($this->tableName(), $ukeys, $uvals);
+ return $ckeys;
+ }
+
}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index d13fdfa52..b57d86226 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -647,8 +647,10 @@ modified = 384
[user_im_prefs__keys]
user_id = K
transport = K
-transport = U
-screenname = U
+; There's another unique index on (transport, screenname)
+; but we have no way to represent a compound index other than
+; the primary key in here. To ensure proper cache purging,
+; we need to tweak the class.
[user_urlshortener_prefs]
user_id = 129
diff --git a/config.php.sample b/config.php.sample
index 20de7ffed..5481ca539 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -45,7 +45,7 @@ $config['site']['path'] = 'statusnet';
// lighttpd, nginx), you can enable X-Sendfile support for better
// performance. Presently, only attachment serving when the site is
// in private mode will use X-Sendfile.
-// $config['site']['X-Sendfile'] = false;
+// $config['site']['use_x_sendfile'] = false;
// You may also need to enable X-Sendfile support for your web server and
// allow it to access files outside of the web root. For Apache with
// mod_xsendfile, you can add these to your .htaccess or server config:
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 2eac5dadf..498a94e68 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -81,3 +81,42 @@ ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+ALTER TABLE consumer add COLUMN consumer_secret varchar(255) not null ; /*comment 'secret value'*/
+
+ALTER TABLE token ADD COLUMN verifier varchar(255); /* comment 'verifier string for OAuth 1.0a',*/
+ALTER TABLE token ADD COLUMN verified_callback varchar(255); /* comment 'verified callback URL for OAuth 1.0a',*/
+
+create table queue_item_new (
+ id serial /* comment 'unique identifier'*/,
+ frame bytea not null /* comment 'data: object reference or opaque string'*/,
+ transport varchar(8) not null /*comment 'queue for what? "email", "jabber", "sms", "irc", ...'*/,
+ created timestamp not null default CURRENT_TIMESTAMP /*comment 'date this record was created'*/,
+ claimed timestamp /*comment 'date this item was claimed'*/,
+ PRIMARY KEY (id)
+);
+
+insert into queue_item_new (frame,transport,created,claimed)
+ select ('0x' || notice_id::text)::bytea,transport,created,claimed from queue_item;
+alter table queue_item rename to queue_item_old;
+alter table queue_item_new rename to queue_item;
+
+ALTER TABLE confirm_address ALTER column sent set default CURRENT_TIMESTAMP;
+
+create table user_location_prefs (
+ user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
+ share_location int default 1 /* comment 'Whether to share location data'*/,
+ created timestamp not null /*comment 'date this record was created'*/,
+ modified timestamp /* comment 'date this record was modified'*/,
+
+ primary key (user_id)
+);
+
+create table inbox (
+
+ user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
+ notice_ids bytea /* comment 'packed list of notice ids' */,
+
+ primary key (user_id)
+
+);
+
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 50660e948..f5db37f04 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -9,13 +9,16 @@ VALUES
('bti','bti','http://gregkh.github.com/bti/', now()),
('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()),
('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
+ ('DarterosStatus', 'Darteros Status', 'http://www.darteros.com/doc/Darteros_Status', now()),
('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
('drupal','Drupal','http://drupal.org/', now()),
- ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()),
+ ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()),
+ ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()),
('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()),
+ ('gNewBook', 'gNewBook', 'http://www.gnewbook.org/', now()),
('gravity', 'Gravity', 'http://mobileways.de/gravity', now()),
('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
@@ -53,6 +56,7 @@ VALUES
('tr.im','tr.im','http://tr.im/', now()),
('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()),
('tweenky','Tweenky','http://beta.tweenky.com/', now()),
+ ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()),
('twhirl','Twhirl','http://www.twhirl.org/', now()),
('twibble','twibble','http://www.twibble.de/', now()),
('Twidge','Twidge','http://software.complete.org/twidge', now()),
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 998cc71e9..2db98550c 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -8,6 +8,10 @@ create table profile (
homepage varchar(255) /* comment 'identifying URL' */,
bio varchar(140) /* comment 'descriptive biography' */,
location varchar(255) /* comment 'physical location' */,
+ lat decimal(10,7) /* comment 'latitude'*/ ,
+ lon decimal(10,7) /* comment 'longitude'*/ ,
+ location_id integer /* comment 'location id if possible'*/ ,
+ location_ns integer /* comment 'namespace for location'*/ ,
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
modified timestamp /* comment 'date this record was modified' */,
@@ -132,6 +136,7 @@ create table notice (
is_local integer default 0 /* comment 'notice was generated by a user' */,
source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
conversation integer /*id of root notice in this conversation' */ references notice (id),
+ location varchar(255) /* comment 'physical location' */,
lat decimal(10,7) /* comment 'latitude'*/ ,
lon decimal(10,7) /* comment 'longitude'*/ ,
location_id integer /* comment 'location id if possible'*/ ,
@@ -182,6 +187,7 @@ create index fave_modified_idx on fave using btree(modified);
create table consumer (
consumer_key varchar(255) primary key /* comment 'unique identifier, root URL' */,
+ consumer_secret varchar(255) not null /* comment 'secret value', */,
seed char(32) not null /* comment 'seed for new tokens by this consumer' */,
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
@@ -195,6 +201,9 @@ create table token (
type integer not null default 0 /* comment 'request or access' */,
state integer default 0 /* comment 'for requests 0 = initial, 1 = authorized, 2 = used' */,
+ verifier varchar(255) /*comment 'verifier string for OAuth 1.0a'*/,
+ verified_callback varchar(255) /*comment 'verified callback URL for OAuth 1.0a'*/,
+
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
modified timestamp /* comment 'date this record was modified' */,
@@ -213,17 +222,33 @@ create table nonce (
primary key (consumer_key, ts, nonce)
);
-/* One-to-many relationship of user to openid_url */
-
-create table user_openid (
- canonical varchar(255) primary key /* comment 'Canonical true URL' */,
- display varchar(255) not null unique /* comment 'URL for viewing, may be different from canonical' */,
- user_id integer not null /* comment 'user owning this URL' */ references "user" (id) ,
+create sequence oauth_application_seq;
+create table oauth_application (
+ id bigint default nextval('oauth_application_seq') primary key /* comment 'unique identifier' */,
+ owner integer not null /* comment 'owner of the application' */ references profile (id),
+ consumer_key varchar(255) not null /* comment 'application consumer key' */ references consumer (consumer_key),
+ name varchar(255) unique not null /* comment 'name of the application' */,
+ description varchar(255) /* comment 'description of the application' */,
+ icon varchar(255) not null /* comment 'application icon' */,
+ source_url varchar(255) /* comment 'application homepage - used for source link' */,
+ organization varchar(255) /* comment 'name of the organization running the application' */,
+ homepage varchar(255) /* comment 'homepage for the organization' */,
+ callback_url varchar(255) /* comment 'url to redirect to after authentication' */,
+ "type" integer default 0 /* comment 'type of app, 1 = browser, 2 = desktop' */,
+ access_type integer default 0 /* comment 'default access type, bit 1 = read, bit 2 = write' */,
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
modified timestamp /* comment 'date this record was modified' */
+);
+create table oauth_application_user (
+ profile_id integer not null /* 'user of the application' */ references profile (id),
+ application_id integer not null /* 'id of the application' */ references oauth_application (id),
+ access_type integer default 0 /* 'access type, bit 1 = read, bit 2 = write' */,
+ token varchar(255) /* 'request or access token' */,
+ created timestamp not null default CURRENT_TIMESTAMP /* 'date this record was created' */,
+ modified timestamp /* 'date this record was modified' */,
+ primary key (profile_id, application_id)
);
-create index user_openid_user_id_idx on user_openid using btree(user_id);
/* These are used by JanRain OpenID library */
@@ -251,7 +276,7 @@ create table confirm_address (
address_extra varchar(255) not null default '' /* comment 'carrier ID, for SMS' */,
address_type varchar(8) not null /* comment 'address type ("email", "jabber", "sms")' */,
claimed timestamp /* comment 'date this was claimed for queueing' */,
- sent timestamp /* comment 'date this was sent for queueing' */,
+ sent timestamp default CURRENT_TIMESTAMP /* comment 'date this was sent for queueing' */,
modified timestamp /* comment 'date this record was modified' */
);
@@ -262,14 +287,12 @@ create table remember_me (
);
create table queue_item (
-
- notice_id integer not null /* comment 'notice queued' */ references notice (id) ,
- transport varchar(8) not null /* comment 'queue for what? "email", "jabber", "sms", "irc", ...' */,
- created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
- claimed timestamp /* comment 'date this item was claimed' */,
-
- primary key (notice_id, transport)
-
+ id serial /* comment 'unique identifier'*/,
+ frame bytea not null /* comment 'data: object reference or opaque string'*/,
+ transport varchar(8) not null /*comment 'queue for what? "email", "jabber", "sms", "irc", ...'*/,
+ created timestamp not null default CURRENT_TIMESTAMP /*comment 'date this record was created'*/,
+ claimed timestamp /*comment 'date this item was claimed'*/,
+ PRIMARY KEY (id)
);
create index queue_item_created_idx on queue_item using btree(created);
@@ -589,3 +612,39 @@ create table login_token (
primary key (user_id)
);
+create table user_location_prefs (
+ user_id integer not null /* comment 'user who has the preference' */ references "user" (id),
+ share_location integer default 1 /* comment 'Whether to share location data' */,
+ created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */,
+ modified timestamp /* comment 'date this record was modified' */,
+
+ primary key (user_id)
+);
+
+create table inbox (
+
+ user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
+ notice_ids bytea /* comment 'packed list of notice ids' */,
+
+ primary key (user_id)
+
+);
+
+create sequence conversation_seq;
+create table conversation (
+ id bigint default nextval('conversation_seq') primary key /* comment 'unique identifier' */,
+ uri varchar(225) unique /* comment 'URI of the conversation' */,
+ created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */,
+ modified timestamp /* comment 'date this record was modified' */
+);
+
+create table local_group (
+
+ group_id integer primary key /* comment 'group represented' */ references user_group (id),
+ nickname varchar(64) unique /* comment 'group represented' */,
+
+ created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */,
+ modified timestamp /* comment 'date this record was modified' */
+
+);
+
diff --git a/doc-src/sms b/doc-src/sms
index 1a3064318..6cdccc6e9 100644
--- a/doc-src/sms
+++ b/doc-src/sms
@@ -1,4 +1,4 @@
-You can post messages to %%site.name%% using a many kinds of cell
+You can post messages to %%site.name%% using many kinds of cell
phones that support SMS messaging. This site does not support SMS
directly; rather, it uses your carrier's email gateway to send and
receive messages.
diff --git a/extlib/Mail.php b/extlib/Mail.php
index 3a0c1a9cb..75132ac2a 100644..100755
--- a/extlib/Mail.php
+++ b/extlib/Mail.php
@@ -1,22 +1,47 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | license@php.net so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Author: Chuck Hagenbuch <chuck@horde.org> |
-// +----------------------------------------------------------------------+
-//
-// $Id: Mail.php,v 1.17 2006/09/15 03:41:18 jon Exp $
+/**
+ * PEAR's Mail:: interface.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2002-2007, Richard Heyes
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Mail
+ * @package Mail
+ * @author Chuck Hagenbuch <chuck@horde.org>
+ * @copyright 1997-2010 Chuck Hagenbuch
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: Mail.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
+ */
require_once 'PEAR.php';
@@ -26,7 +51,7 @@ require_once 'PEAR.php';
* useful in multiple mailer backends.
*
* @access public
- * @version $Revision: 1.17 $
+ * @version $Revision: 294747 $
* @package Mail
*/
class Mail
@@ -82,12 +107,20 @@ class Mail
* @return mixed Returns true on success, or a PEAR_Error
* containing a descriptive error message on
* failure.
+ *
* @access public
* @deprecated use Mail_mail::send instead
*/
function send($recipients, $headers, $body)
{
- $this->_sanitizeHeaders($headers);
+ if (!is_array($headers)) {
+ return PEAR::raiseError('$headers must be an array');
+ }
+
+ $result = $this->_sanitizeHeaders($headers);
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
+ }
// if we're passed an array of recipients, implode it.
if (is_array($recipients)) {
@@ -103,10 +136,9 @@ class Mail
}
// flatten the headers out.
- list(,$text_headers) = Mail::prepareHeaders($headers);
+ list(, $text_headers) = Mail::prepareHeaders($headers);
return mail($recipients, $subject, $body, $text_headers);
-
}
/**
@@ -151,9 +183,9 @@ class Mail
foreach ($headers as $key => $value) {
if (strcasecmp($key, 'From') === 0) {
include_once 'Mail/RFC822.php';
- $parser = &new Mail_RFC822();
+ $parser = new Mail_RFC822();
$addresses = $parser->parseAddressList($value, 'localhost', false);
- if (PEAR::isError($addresses)) {
+ if (is_a($addresses, 'PEAR_Error')) {
return $addresses;
}
@@ -221,7 +253,7 @@ class Mail
$addresses = Mail_RFC822::parseAddressList($recipients, 'localhost', false);
// If parseAddressList() returned a PEAR_Error object, just return it.
- if (PEAR::isError($addresses)) {
+ if (is_a($addresses, 'PEAR_Error')) {
return $addresses;
}
diff --git a/extlib/Mail/RFC822.php b/extlib/Mail/RFC822.php
index 8714df2e2..58d36465c 100644..100755
--- a/extlib/Mail/RFC822.php
+++ b/extlib/Mail/RFC822.php
@@ -1,37 +1,48 @@
<?php
-// +-----------------------------------------------------------------------+
-// | Copyright (c) 2001-2002, Richard Heyes |
-// | All rights reserved. |
-// | |
-// | Redistribution and use in source and binary forms, with or without |
-// | modification, are permitted provided that the following conditions |
-// | are met: |
-// | |
-// | o Redistributions of source code must retain the above copyright |
-// | notice, this list of conditions and the following disclaimer. |
-// | o Redistributions in binary form must reproduce the above copyright |
-// | notice, this list of conditions and the following disclaimer in the |
-// | documentation and/or other materials provided with the distribution.|
-// | o The names of the authors may not be used to endorse or promote |
-// | products derived from this software without specific prior written |
-// | permission. |
-// | |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-// | |
-// +-----------------------------------------------------------------------+
-// | Authors: Richard Heyes <richard@phpguru.org> |
-// | Chuck Hagenbuch <chuck@horde.org> |
-// +-----------------------------------------------------------------------+
+/**
+ * RFC 822 Email address list validation Utility
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2001-2010, Richard Heyes
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Mail
+ * @package Mail
+ * @author Richard Heyes <richard@phpguru.org>
+ * @author Chuck Hagenbuch <chuck@horde.org
+ * @copyright 2001-2010 Richard Heyes
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: RFC822.php 294749 2010-02-08 08:22:25Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
+ */
/**
* RFC 822 Email address list validation Utility
@@ -52,7 +63,7 @@
*
* @author Richard Heyes <richard@phpguru.org>
* @author Chuck Hagenbuch <chuck@horde.org>
- * @version $Revision: 1.24 $
+ * @version $Revision: 294749 $
* @license BSD
* @package Mail
*/
@@ -635,8 +646,8 @@ class Mail_RFC822 {
$comment = $this->_splitCheck($parts, ')');
$comments[] = $comment;
- // +1 is for the trailing )
- $_mailbox = substr($_mailbox, strpos($_mailbox, $comment)+strlen($comment)+1);
+ // +2 is for the brackets
+ $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment)+strlen($comment)+2);
} else {
break;
}
diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php
index b13d69565..a8b4b5dbe 100644..100755
--- a/extlib/Mail/mail.php
+++ b/extlib/Mail/mail.php
@@ -1,27 +1,52 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | license@php.net so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Author: Chuck Hagenbuch <chuck@horde.org> |
-// +----------------------------------------------------------------------+
-//
-// $Id: mail.php,v 1.20 2007/10/06 17:00:00 chagenbu Exp $
+/**
+ * internal PHP-mail() implementation of the PEAR Mail:: interface.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010 Chuck Hagenbuch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Mail
+ * @package Mail
+ * @author Chuck Hagenbuch <chuck@horde.org>
+ * @copyright 2010 Chuck Hagenbuch
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: mail.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
+ */
/**
* internal PHP-mail() implementation of the PEAR Mail:: interface.
* @package Mail
- * @version $Revision: 1.20 $
+ * @version $Revision: 294747 $
*/
class Mail_mail extends Mail {
diff --git a/extlib/Mail/mock.php b/extlib/Mail/mock.php
index 971dae6a0..61570ba40 100644..100755
--- a/extlib/Mail/mock.php
+++ b/extlib/Mail/mock.php
@@ -1,29 +1,53 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | license@php.net so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Author: Chuck Hagenbuch <chuck@horde.org> |
-// +----------------------------------------------------------------------+
-//
-// $Id: mock.php,v 1.1 2007/12/08 17:57:54 chagenbu Exp $
-//
+/**
+ * Mock implementation
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010 Chuck Hagenbuch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Mail
+ * @package Mail
+ * @author Chuck Hagenbuch <chuck@horde.org>
+ * @copyright 2010 Chuck Hagenbuch
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: mock.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
+ */
/**
* Mock implementation of the PEAR Mail:: interface for testing.
* @access public
* @package Mail
- * @version $Revision: 1.1 $
+ * @version $Revision: 294747 $
*/
class Mail_mock extends Mail {
diff --git a/extlib/Mail/null.php b/extlib/Mail/null.php
index 982bfa45b..f8d58272e 100644..100755
--- a/extlib/Mail/null.php
+++ b/extlib/Mail/null.php
@@ -1,29 +1,53 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | license@php.net so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Author: Phil Kernick <philk@rotfl.com.au> |
-// +----------------------------------------------------------------------+
-//
-// $Id: null.php,v 1.2 2004/04/06 05:19:03 jon Exp $
-//
+/**
+ * Null implementation of the PEAR Mail interface
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010 Phil Kernick
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Mail
+ * @package Mail
+ * @author Phil Kernick <philk@rotfl.com.au>
+ * @copyright 2010 Phil Kernick
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: null.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
+ */
/**
* Null implementation of the PEAR Mail:: interface.
* @access public
* @package Mail
- * @version $Revision: 1.2 $
+ * @version $Revision: 294747 $
*/
class Mail_null extends Mail {
diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php
index cd248e61d..b056575e9 100644..100755
--- a/extlib/Mail/sendmail.php
+++ b/extlib/Mail/sendmail.php
@@ -20,7 +20,7 @@
* Sendmail implementation of the PEAR Mail:: interface.
* @access public
* @package Mail
- * @version $Revision: 1.19 $
+ * @version $Revision: 294744 $
*/
class Mail_sendmail extends Mail {
@@ -117,7 +117,7 @@ class Mail_sendmail extends Mail {
if (is_a($recipients, 'PEAR_Error')) {
return $recipients;
}
- $recipients = escapeShellCmd(implode(' ', $recipients));
+ $recipients = implode(' ', array_map('escapeshellarg', $recipients));
$headerElements = $this->prepareHeaders($headers);
if (is_a($headerElements, 'PEAR_Error')) {
@@ -141,7 +141,8 @@ class Mail_sendmail extends Mail {
return PEAR::raiseError('From address specified with dangerous characters.');
}
- $from = escapeShellCmd($from);
+ $from = escapeshellarg($from); // Security bug #16200
+
$mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
if (!$mail) {
return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.');
diff --git a/extlib/Mail/smtp.php b/extlib/Mail/smtp.php
index baf3a962b..52ea60208 100644..100755
--- a/extlib/Mail/smtp.php
+++ b/extlib/Mail/smtp.php
@@ -1,21 +1,48 @@
<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4 |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license, |
-// | that is bundled with this package in the file LICENSE, and is |
-// | available at through the world-wide-web at |
-// | http://www.php.net/license/2_02.txt. |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to |
-// | license@php.net so we can mail you a copy immediately. |
-// +----------------------------------------------------------------------+
-// | Authors: Chuck Hagenbuch <chuck@horde.org> |
-// | Jon Parise <jon@php.net> |
-// +----------------------------------------------------------------------+
+/**
+ * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010, Chuck Hagenbuch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category HTTP
+ * @package HTTP_Request
+ * @author Jon Parise <jon@php.net>
+ * @author Chuck Hagenbuch <chuck@horde.org>
+ * @copyright 2010 Chuck Hagenbuch
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: smtp.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
+ */
/** Error: Failed to create a Net_SMTP object */
define('PEAR_MAIL_SMTP_ERROR_CREATE', 10000);
@@ -42,7 +69,7 @@ define('PEAR_MAIL_SMTP_ERROR_DATA', 10006);
* SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class.
* @access public
* @package Mail
- * @version $Revision: 1.33 $
+ * @version $Revision: 294747 $
*/
class Mail_smtp extends Mail {
@@ -278,6 +305,16 @@ class Mail_smtp extends Mail {
/* Send the message's headers and the body as SMTP data. */
$res = $this->_smtp->data($textHeaders . "\r\n\r\n" . $body);
+ list(,$args) = $this->_smtp->getResponse();
+
+ if (preg_match("/Ok: queued as (.*)/", $args, $queued)) {
+ $this->queued_as = $queued[1];
+ }
+
+ /* we need the greeting; from it we can extract the authorative name of the mail server we've really connected to.
+ * ideal if we're connecting to a round-robin of relay servers and need to track which exact one took the email */
+ $this->greeting = $this->_smtp->getGreeting();
+
if (is_a($res, 'PEAR_Error')) {
$error = $this->_error('Failed to send data', $res);
$this->_smtp->rset();
diff --git a/extlib/Mail/smtpmx.php b/extlib/Mail/smtpmx.php
index 9d2dccfb1..f0b694086 100644..100755
--- a/extlib/Mail/smtpmx.php
+++ b/extlib/Mail/smtpmx.php
@@ -8,19 +8,43 @@
*
* PHP versions 4 and 5
*
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt. If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * LICENSE:
+ *
+ * Copyright (c) 2010, gERD Schaufelberger
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* @category Mail
* @package Mail_smtpmx
* @author gERD Schaufelberger <gerd@php-tools.net>
- * @copyright 1997-2005 The PHP Group
- * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: smtpmx.php,v 1.2 2007/10/06 17:00:00 chagenbu Exp $
- * @see Mail
+ * @copyright 2010 gERD Schaufelberger
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version CVS: $Id: smtpmx.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link http://pear.php.net/package/Mail/
*/
require_once 'Net/SMTP.php';
@@ -32,7 +56,7 @@ require_once 'Net/SMTP.php';
* @access public
* @author gERD Schaufelberger <gerd@php-tools.net>
* @package Mail
- * @version $Revision: 1.2 $
+ * @version $Revision: 294747 $
*/
class Mail_smtpmx extends Mail {
diff --git a/extlib/Net/SMTP.php b/extlib/Net/SMTP.php
index d632258d6..ea4b55e8d 100644
--- a/extlib/Net/SMTP.php
+++ b/extlib/Net/SMTP.php
@@ -18,7 +18,7 @@
// | Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar> |
// +----------------------------------------------------------------------+
//
-// $Id: SMTP.php,v 1.63 2008/06/10 05:39:12 jon Exp $
+// $Id: SMTP.php 293948 2010-01-24 21:46:00Z jon $
require_once 'PEAR.php';
require_once 'Net/Socket.php';
@@ -92,6 +92,13 @@ class Net_SMTP
var $_debug = false;
/**
+ * Debug output handler.
+ * @var callback
+ * @access private
+ */
+ var $_debug_handler = null;
+
+ /**
* The socket resource being used to connect to the SMTP server.
* @var resource
* @access private
@@ -113,6 +120,13 @@ class Net_SMTP
var $_arguments = array();
/**
+ * Stores the SMTP server's greeting string.
+ * @var string
+ * @access private
+ */
+ var $_greeting = null;
+
+ /**
* Stores detected features of the SMTP server.
* @var array
* @access private
@@ -172,9 +186,30 @@ class Net_SMTP
* @access public
* @since 1.1.0
*/
- function setDebug($debug)
+ function setDebug($debug, $handler = null)
{
$this->_debug = $debug;
+ $this->_debug_handler = $handler;
+ }
+
+ /**
+ * Write the given debug text to the current debug output handler.
+ *
+ * @param string $message Debug mesage text.
+ *
+ * @access private
+ * @since 1.3.3
+ */
+ function _debug($message)
+ {
+ if ($this->_debug) {
+ if ($this->_debug_handler) {
+ call_user_func_array($this->_debug_handler,
+ array(&$this, $message));
+ } else {
+ echo "DEBUG: $message\n";
+ }
+ }
}
/**
@@ -189,13 +224,12 @@ class Net_SMTP
*/
function _send($data)
{
- if ($this->_debug) {
- echo "DEBUG: Send: $data\n";
- }
+ $this->_debug("Send: $data");
- if (PEAR::isError($error = $this->_socket->write($data))) {
- return PEAR::raiseError('Failed to write to socket: ' .
- $error->getMessage());
+ $error = $this->_socket->write($data);
+ if ($error === false || PEAR::isError($error)) {
+ $msg = ($error) ? $error->getMessage() : "unknown error";
+ return PEAR::raiseError("Failed to write to socket: $msg");
}
return true;
@@ -262,9 +296,7 @@ class Net_SMTP
for ($i = 0; $i <= $this->_pipelined_commands; $i++) {
while ($line = $this->_socket->readLine()) {
- if ($this->_debug) {
- echo "DEBUG: Recv: $line\n";
- }
+ $this->_debug("Recv: $line");
/* If we receive an empty line, the connection has been closed. */
if (empty($line)) {
@@ -320,6 +352,20 @@ class Net_SMTP
}
/**
+ * Return the SMTP server's greeting string.
+ *
+ * @return string A string containing the greeting string, or null if a
+ * greeting has not been received.
+ *
+ * @access public
+ * @since 1.3.3
+ */
+ function getGreeting()
+ {
+ return $this->_greeting;
+ }
+
+ /**
* Attempt to connect to the SMTP server.
*
* @param int $timeout The timeout value (in seconds) for the
@@ -334,6 +380,7 @@ class Net_SMTP
*/
function connect($timeout = null, $persistent = false)
{
+ $this->_greeting = null;
$result = $this->_socket->connect($this->host, $this->port,
$persistent, $timeout);
if (PEAR::isError($result)) {
@@ -344,6 +391,10 @@ class Net_SMTP
if (PEAR::isError($error = $this->_parseResponse(220))) {
return $error;
}
+
+ /* Extract and store a copy of the server's greeting string. */
+ list(, $this->_greeting) = $this->getResponse();
+
if (PEAR::isError($error = $this->_negotiate())) {
return $error;
}
@@ -452,40 +503,43 @@ class Net_SMTP
* @param string The password to authenticate with.
* @param string The requested authentication method. If none is
* specified, the best supported method will be used.
+ * @param bool Flag indicating whether or not TLS should be attempted.
*
* @return mixed Returns a PEAR_Error with an error message on any
* kind of failure, or true on success.
* @access public
* @since 1.0
*/
- function auth($uid, $pwd , $method = '')
+ function auth($uid, $pwd , $method = '', $tls = true)
{
- if (empty($this->_esmtp['AUTH'])) {
- if (version_compare(PHP_VERSION, '5.1.0', '>=')) {
- if (!isset($this->_esmtp['STARTTLS'])) {
- return PEAR::raiseError('SMTP server does not support authentication');
- }
- if (PEAR::isError($result = $this->_put('STARTTLS'))) {
- return $result;
- }
- if (PEAR::isError($result = $this->_parseResponse(220))) {
- return $result;
- }
- if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
- return $result;
- } elseif ($result !== true) {
- return PEAR::raiseError('STARTTLS failed');
- }
-
- /* Send EHLO again to recieve the AUTH string from the
- * SMTP server. */
- $this->_negotiate();
- if (empty($this->_esmtp['AUTH'])) {
- return PEAR::raiseError('SMTP server does not support authentication');
- }
- } else {
- return PEAR::raiseError('SMTP server does not support authentication');
+ /* We can only attempt a TLS connection if one has been requested,
+ * we're running PHP 5.1.0 or later, have access to the OpenSSL
+ * extension, are connected to an SMTP server which supports the
+ * STARTTLS extension, and aren't already connected over a secure
+ * (SSL) socket connection. */
+ if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') &&
+ extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) &&
+ strncasecmp($this->host, 'ssl://', 6) !== 0) {
+ /* Start the TLS connection attempt. */
+ if (PEAR::isError($result = $this->_put('STARTTLS'))) {
+ return $result;
+ }
+ if (PEAR::isError($result = $this->_parseResponse(220))) {
+ return $result;
+ }
+ if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
+ return $result;
+ } elseif ($result !== true) {
+ return PEAR::raiseError('STARTTLS failed');
}
+
+ /* Send EHLO again to recieve the AUTH string from the
+ * SMTP server. */
+ $this->_negotiate();
+ }
+
+ if (empty($this->_esmtp['AUTH'])) {
+ return PEAR::raiseError('SMTP server does not support authentication');
}
/* If no method has been specified, get the name of the best
@@ -844,30 +898,51 @@ class Net_SMTP
/**
* Send the DATA command.
*
- * @param string $data The message body to send.
+ * @param mixed $data The message data, either as a string or an open
+ * file resource.
+ * @param string $headers The message headers. If $headers is provided,
+ * $data is assumed to contain only body data.
*
* @return mixed Returns a PEAR_Error with an error message on any
* kind of failure, or true on success.
* @access public
* @since 1.0
*/
- function data($data)
+ function data($data, $headers = null)
{
+ /* Verify that $data is a supported type. */
+ if (!is_string($data) && !is_resource($data)) {
+ return PEAR::raiseError('Expected a string or file resource');
+ }
+
/* RFC 1870, section 3, subsection 3 states "a value of zero
* indicates that no fixed maximum message size is in force".
* Furthermore, it says that if "the parameter is omitted no
* information is conveyed about the server's fixed maximum
* message size". */
if (isset($this->_esmtp['SIZE']) && ($this->_esmtp['SIZE'] > 0)) {
- if (strlen($data) >= $this->_esmtp['SIZE']) {
+ /* Start by considering the size of the optional headers string.
+ * We also account for the addition 4 character "\r\n\r\n"
+ * separator sequence. */
+ $size = (is_null($headers)) ? 0 : strlen($headers) + 4;
+
+ if (is_resource($data)) {
+ $stat = fstat($data);
+ if ($stat === false) {
+ return PEAR::raiseError('Failed to get file size');
+ }
+ $size += $stat['size'];
+ } else {
+ $size += strlen($data);
+ }
+
+ if ($size >= $this->_esmtp['SIZE']) {
$this->disconnect();
- return PEAR::raiseError('Message size excedes the server limit');
+ return PEAR::raiseError('Message size exceeds server limit');
}
}
- /* Quote the data based on the SMTP standards. */
- $this->quotedata($data);
-
+ /* Initiate the DATA command. */
if (PEAR::isError($error = $this->_put('DATA'))) {
return $error;
}
@@ -875,9 +950,40 @@ class Net_SMTP
return $error;
}
- if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) {
- return $result;
+ /* If we have a separate headers string, send it first. */
+ if (!is_null($headers)) {
+ $this->quotedata($headers);
+ if (PEAR::isError($result = $this->_send($headers . "\r\n\r\n"))) {
+ return $result;
+ }
}
+
+ /* Now we can send the message body data. */
+ if (is_resource($data)) {
+ /* Stream the contents of the file resource out over our socket
+ * connection, line by line. Each line must be run through the
+ * quoting routine. */
+ while ($line = fgets($data, 1024)) {
+ $this->quotedata($line);
+ if (PEAR::isError($result = $this->_send($line))) {
+ return $result;
+ }
+ }
+
+ /* Finally, send the DATA terminator sequence. */
+ if (PEAR::isError($result = $this->_send("\r\n.\r\n"))) {
+ return $result;
+ }
+ } else {
+ /* Just send the entire quoted string followed by the DATA
+ * terminator. */
+ $this->quotedata($data);
+ if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) {
+ return $result;
+ }
+ }
+
+ /* Verify that the data was successfully received by the server. */
if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
return $error;
}
diff --git a/index.php b/index.php
index 66a9838d6..0aceeda55 100644
--- a/index.php
+++ b/index.php
@@ -19,16 +19,20 @@
* @category StatusNet
* @package StatusNet
* @author Brenda Wallace <shiny@cpan.org>
+ * @author Brion Vibber <brion@pobox.com>
* @author Christopher Vollick <psycotica0@gmail.com>
* @author CiaranG <ciaran@ciarang.com>
* @author Craig Andrews <candrews@integralblue.com>
* @author Evan Prodromou <evan@controlezvous.ca>
* @author Gina Haeussge <osd@foosel.net>
+ * @author James Walker <walkah@walkah.net>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Mike Cochrane <mikec@mikenz.geek.nz>
* @author Robin Millette <millette@controlyourself.ca>
* @author Sarven Capadisli <csarven@controlyourself.ca>
* @author Tom Adams <tom@holizz.com>
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
*
* @license GNU Affero General Public License http://www.gnu.org/licenses/
*/
@@ -200,7 +204,7 @@ function checkMirror($action_obj, $args)
function isLoginAction($action)
{
- static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch');
+ static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd');
$login = null;
diff --git a/install.php b/install.php
index 08555d19b..158d51fa3 100644
--- a/install.php
+++ b/install.php
@@ -31,6 +31,7 @@
* @author Sarven Capadisli <csarven@status.net>
* @author Tom Adams <tom@holizz.com>
* @author Zach Copley <zach@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license GNU Affero General Public License http://www.gnu.org/licenses/
* @version 0.9.x
* @link http://status.net
diff --git a/js/util.js b/js/util.js
index 1320d11b4..29b33097b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -84,7 +84,7 @@ var SN = { // StatusNet
form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
}
- if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) {
+ if ($('body')[0].id != 'conversation' && window.location.hash.length === 0 && $(window).scrollTop() == 0) {
form.find('textarea').focus();
}
},
diff --git a/lib/action.php b/lib/action.php
index 4296ae7de..2b3b707c5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -235,6 +235,16 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowDesign', array($this));
}
Event::handle('EndShowStyles', array($this));
+
+ if (common_config('custom_css', 'enabled')) {
+ $css = common_config('custom_css', 'css');
+ if (Event::handle('StartShowCustomCss', array($this, &$css))) {
+ if (trim($css) != '') {
+ $this->style($css);
+ }
+ Event::handle('EndShowCustomCss', array($this));
+ }
+ }
}
}
@@ -467,7 +477,7 @@ class Action extends HTMLOutputter // lawsuit
_m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
}
else {
- if (!common_config('site', 'closed')) {
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
// TRANS: Tooltip for main menu option "Register"
$tooltip = _m('TOOLTIP', 'Create an account');
$this->menuItem(common_local_url('register'),
diff --git a/lib/activity.php b/lib/activity.php
index 365bb6258..8e2da99bb 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -83,6 +83,7 @@ class Activity
const CREATOR = 'creator';
const CONTENTNS = 'http://purl.org/rss/1.0/modules/content/';
+ const ENCODED = 'encoded';
public $actor; // an ActivityObject
public $verb; // a string (the URL)
@@ -269,14 +270,21 @@ class Activity
$this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, self::RSS);
- $contentEl = ActivityUtils::child($item, ActivityUtils::CONTENT, self::CONTENTNS);
+ $contentEl = ActivityUtils::child($item, self::ENCODED, self::CONTENTNS);
if (!empty($contentEl)) {
- $this->content = htmlspecialchars_decode($contentEl->textContent, ENT_QUOTES);
+ // <content:encoded> XML node's text content is HTML; no further processing needed.
+ $this->content = $contentEl->textContent;
} else {
$descriptionEl = ActivityUtils::child($item, self::DESCRIPTION, self::RSS);
if (!empty($descriptionEl)) {
- $this->content = htmlspecialchars_decode($descriptionEl->textContent, ENT_QUOTES);
+ // Per spec, <description> must be plaintext.
+ // In practice, often there's HTML... but these days good
+ // feeds are using <content:encoded> which is explicitly
+ // real HTML.
+ // We'll treat this following spec, and do HTML escaping
+ // to convert from plaintext to HTML.
+ $this->content = htmlspecialchars($descriptionEl->textContent);
}
}
diff --git a/lib/activityutils.php b/lib/activityutils.php
index a7e99fb11..401fd7fc2 100644
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -213,11 +213,19 @@ class ActivityUtils
// slavishly following http://atompub.org/rfc4287.html#rfc.section.4.1.3.3
if (empty($type) || $type == 'text') {
- return $el->textContent;
+ // We have plaintext saved as the XML text content.
+ // Since we want HTML, we need to escape any special chars.
+ return htmlspecialchars($el->textContent);
} else if ($type == 'html') {
+ // We have HTML saved as the XML text content.
+ // No additional processing required once we've got it.
$text = $el->textContent;
- return htmlspecialchars_decode($text, ENT_QUOTES);
+ return $text;
} else if ($type == 'xhtml') {
+ // Per spec, the <content type="xhtml"> contains a single
+ // HTML <div> with XHTML namespace on it as a child node.
+ // We need to pull all of that <div>'s child nodes and
+ // serialize them back to an (X)HTML source fragment.
$divEl = ActivityUtils::child($el, 'div', 'http://www.w3.org/1999/xhtml');
if (empty($divEl)) {
return null;
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 6c9947608..9e0b2d041 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -284,9 +284,10 @@ class AdminPanelAction extends Action
$this->clientError(_("Unable to delete design setting."));
return null;
}
+ return $result;
}
- return $result;
+ return null;
}
function canAdmin($name)
diff --git a/lib/apiaction.php b/lib/apiaction.php
index d5580abd3..e6b516453 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -28,14 +28,78 @@
* @author Toby Inkster <mail@tobyinkster.co.uk>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how the API works. */
+
+/*! @mainpage StatusNet REST API
+
+ @section Introduction
+
+ Some explanatory text about the API would be nice.
+
+ @section API Methods
+
+ @subsection timelinesmethods_sec Timeline Methods
+
+ @li @ref publictimeline
+ @li @ref friendstimeline
+
+ @subsection statusmethods_sec Status Methods
+
+ @li @ref statusesupdate
+
+ @subsection usermethods_sec User Methods
+
+ @subsection directmessagemethods_sec Direct Message Methods
+
+ @subsection friendshipmethods_sec Friendship Methods
+
+ @subsection socialgraphmethods_sec Social Graph Methods
+
+ @subsection accountmethods_sec Account Methods
+
+ @subsection favoritesmethods_sec Favorites Methods
+
+ @subsection blockmethods_sec Block Methods
+
+ @subsection oauthmethods_sec OAuth Methods
+
+ @subsection helpmethods_sec Help Methods
+
+ @subsection groupmethods_sec Group Methods
+
+ @page apiroot API Root
+
+ The URLs for methods referred to in this API documentation are
+ relative to the StatusNet API root. The API root is determined by the
+ site's @b server and @b path variables, which are generally specified
+ in config.php. For example:
+
+ @code
+ $config['site']['server'] = 'example.org';
+ $config['site']['path'] = 'statusnet'
+ @endcode
+
+ The pattern for a site's API root is: @c protocol://server/path/api E.g:
+
+ @c http://example.org/statusnet/api
+
+ The @b path can be empty. In that case the API root would simply be:
+
+ @c http://example.org/api
+
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
+class ApiValidationException extends Exception { }
+
/**
* Contains most of the Twitter-compatible API output functions.
*
@@ -63,9 +127,12 @@ class ApiAction extends Action
var $count = null;
var $max_id = null;
var $since_id = null;
+ var $source = null;
var $access = self::READ_ONLY; // read (default) or read-write
+ static $reserved_sources = array('web', 'omb', 'ostatus', 'mail', 'xmpp', 'api');
+
/**
* Initialization.
*
@@ -89,6 +156,12 @@ class ApiAction extends Action
header('X-StatusNet-Warning: since parameter is disabled; use since_id');
}
+ $this->source = $this->trimmed('source');
+
+ if (empty($this->source) || in_array($this->source, self::$reserved_sources)) {
+ $this->source = 'api';
+ }
+
return true;
}
@@ -200,11 +273,13 @@ class ApiAction extends Action
// Is the requesting user following this user?
$twitter_user['following'] = false;
+ $twitter_user['statusnet:blocking'] = false;
$twitter_user['notifications'] = false;
if (isset($this->auth_user)) {
$twitter_user['following'] = $this->auth_user->isSubscribed($profile);
+ $twitter_user['statusnet:blocking'] = $this->auth_user->hasBlocked($profile);
// Notifications on?
$sub = Subscription::pkeyGet(array('subscriber' =>
@@ -224,6 +299,10 @@ class ApiAction extends Action
}
}
+ // StatusNet-specific
+
+ $twitter_user['statusnet:profile_url'] = $profile->profileurl;
+
return $twitter_user;
}
@@ -252,7 +331,23 @@ class ApiAction extends Action
$twitter_status['created_at'] = $this->dateTwitter($notice->created);
$twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
intval($notice->reply_to) : null;
- $twitter_status['source'] = $this->sourceLink($notice->source);
+
+ $source = null;
+
+ $ns = $notice->getSource();
+ if ($ns) {
+ if (!empty($ns->name) && !empty($ns->url)) {
+ $source = '<a href="'
+ . htmlspecialchars($ns->url)
+ . '" rel="nofollow">'
+ . htmlspecialchars($ns->name)
+ . '</a>';
+ } else {
+ $source = $ns->code;
+ }
+ }
+
+ $twitter_status['source'] = $source;
$twitter_status['id'] = intval($notice->id);
$replier_profile = null;
@@ -309,25 +404,41 @@ class ApiAction extends Action
$twitter_status['user'] = $twitter_user;
}
+ // StatusNet-specific
+
+ $twitter_status['statusnet:html'] = $notice->rendered;
+
return $twitter_status;
}
function twitterGroupArray($group)
{
- $twitter_group=array();
- $twitter_group['id']=$group->id;
- $twitter_group['url']=$group->permalink();
- $twitter_group['nickname']=$group->nickname;
- $twitter_group['fullname']=$group->fullname;
- $twitter_group['original_logo']=$group->original_logo;
- $twitter_group['homepage_logo']=$group->homepage_logo;
- $twitter_group['stream_logo']=$group->stream_logo;
- $twitter_group['mini_logo']=$group->mini_logo;
- $twitter_group['homepage']=$group->homepage;
- $twitter_group['description']=$group->description;
- $twitter_group['location']=$group->location;
- $twitter_group['created']=$this->dateTwitter($group->created);
- $twitter_group['modified']=$this->dateTwitter($group->modified);
+ $twitter_group = array();
+
+ $twitter_group['id'] = $group->id;
+ $twitter_group['url'] = $group->permalink();
+ $twitter_group['nickname'] = $group->nickname;
+ $twitter_group['fullname'] = $group->fullname;
+
+ if (isset($this->auth_user)) {
+ $twitter_group['member'] = $this->auth_user->isMember($group);
+ $twitter_group['blocked'] = Group_block::isBlocked(
+ $group,
+ $this->auth_user->getProfile()
+ );
+ }
+
+ $twitter_group['member_count'] = $group->getMemberCount();
+ $twitter_group['original_logo'] = $group->original_logo;
+ $twitter_group['homepage_logo'] = $group->homepage_logo;
+ $twitter_group['stream_logo'] = $group->stream_logo;
+ $twitter_group['mini_logo'] = $group->mini_logo;
+ $twitter_group['homepage'] = $group->homepage;
+ $twitter_group['description'] = $group->description;
+ $twitter_group['location'] = $group->location;
+ $twitter_group['created'] = $this->dateTwitter($group->created);
+ $twitter_group['modified'] = $this->dateTwitter($group->modified);
+
return $twitter_group;
}
@@ -476,9 +587,13 @@ class ApiAction extends Action
}
}
- function showTwitterXmlStatus($twitter_status, $tag='status')
+ function showTwitterXmlStatus($twitter_status, $tag='status', $namespaces=false)
{
- $this->elementStart($tag);
+ $attrs = array();
+ if ($namespaces) {
+ $attrs['xmlns:statusnet'] = 'http://status.net/schema/api/1/';
+ }
+ $this->elementStart($tag, $attrs);
foreach($twitter_status as $element => $value) {
switch ($element) {
case 'user':
@@ -512,9 +627,13 @@ class ApiAction extends Action
$this->elementEnd('group');
}
- function showTwitterXmlUser($twitter_user, $role='user')
+ function showTwitterXmlUser($twitter_user, $role='user', $namespaces=false)
{
- $this->elementStart($role);
+ $attrs = array();
+ if ($namespaces) {
+ $attrs['xmlns:statusnet'] = 'http://status.net/schema/api/1/';
+ }
+ $this->elementStart($role, $attrs);
foreach($twitter_user as $element => $value) {
if ($element == 'status') {
$this->showTwitterXmlStatus($twitter_user['status']);
@@ -596,7 +715,7 @@ class ApiAction extends Action
{
$this->initDocument('xml');
$twitter_status = $this->twitterStatusArray($notice);
- $this->showTwitterXmlStatus($twitter_status);
+ $this->showTwitterXmlStatus($twitter_status, 'status', true);
$this->endDocument('xml');
}
@@ -612,7 +731,8 @@ class ApiAction extends Action
{
$this->initDocument('xml');
- $this->elementStart('statuses', array('type' => 'array'));
+ $this->elementStart('statuses', array('type' => 'array',
+ 'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
if (is_array($notice)) {
foreach ($notice as $n) {
@@ -779,9 +899,13 @@ class ApiAction extends Action
$this->elementEnd('entry');
}
- function showXmlDirectMessage($dm)
+ function showXmlDirectMessage($dm, $namespaces=false)
{
- $this->elementStart('direct_message');
+ $attrs = array();
+ if ($namespaces) {
+ $attrs['xmlns:statusnet'] = 'http://status.net/schema/api/1/';
+ }
+ $this->elementStart('direct_message', $attrs);
foreach($dm as $element => $value) {
switch ($element) {
case 'sender':
@@ -858,7 +982,7 @@ class ApiAction extends Action
{
$this->initDocument('xml');
$dmsg = $this->directMessageArray($message);
- $this->showXmlDirectMessage($dmsg);
+ $this->showXmlDirectMessage($dmsg, true);
$this->endDocument('xml');
}
@@ -975,7 +1099,8 @@ class ApiAction extends Action
{
$this->initDocument('xml');
- $this->elementStart('users', array('type' => 'array'));
+ $this->elementStart('users', array('type' => 'array',
+ 'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
if (is_array($user)) {
foreach ($user as $u) {
@@ -1293,43 +1418,6 @@ class ApiAction extends Action
}
}
- function sourceLink($source)
- {
- $source_name = _($source);
- switch ($source) {
- case 'web':
- case 'xmpp':
- case 'mail':
- case 'omb':
- case 'api':
- break;
- default:
-
- $name = null;
- $url = null;
-
- $ns = Notice_source::staticGet($source);
-
- if ($ns) {
- $name = $ns->name;
- $url = $ns->url;
- } else {
- $app = Oauth_application::staticGet('name', $source);
- if ($app) {
- $name = $app->name;
- $url = $app->source_url;
- }
- }
-
- if (!empty($name) && !empty($url)) {
- $source_name = '<a href="' . $url . '">' . $name . '</a>';
- }
-
- break;
- }
- return $source_name;
- }
-
/**
* Returns query argument or default value if not found. Certain
* parameters used throughout the API are lightly scrubbed and
diff --git a/lib/apiauth.php b/lib/apiauth.php
index d6ad7e021..91cb64262 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -30,10 +30,29 @@
* @author Sarven Capadisli <csarven@status.net>
* @author Zach Copley <zach@status.net>
* @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page authentication Authentication
+
+ StatusNet supports HTTP Basic Authentication and OAuth for API calls.
+
+ @warning Currently, users who have created accounts without setting a
+ password via OpenID, Facebook Connect, etc., cannot use the API until
+ they set a password with their account settings panel.
+
+ @section HTTP Basic Auth
+
+
+
+ @section OAuth
+
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
@@ -54,7 +73,6 @@ class ApiAuthAction extends ApiAction
{
var $auth_user_nickname = null;
var $auth_user_password = null;
- var $oauth_source = null;
/**
* Take arguments for running, looks for an OAuth request,
@@ -163,7 +181,7 @@ class ApiAuthAction extends ApiAction
// set the source attr
- $this->oauth_source = $app->name;
+ $this->source = $app->name;
$appUser = Oauth_application_user::staticGet('token', $access_token);
diff --git a/lib/apibareauth.php b/lib/apibareauth.php
index 2d29c1ddd..da7af1261 100644
--- a/lib/apibareauth.php
+++ b/lib/apibareauth.php
@@ -32,6 +32,7 @@
* @author Sarven Capadisli <csarven@status.net>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -106,4 +107,4 @@ class ApiBareAuthAction extends ApiAuthAction
return false;
}
-} \ No newline at end of file
+}
diff --git a/lib/apiprivateauth.php b/lib/apiprivateauth.php
index 5d0033005..5e78c65a1 100644
--- a/lib/apiprivateauth.php
+++ b/lib/apiprivateauth.php
@@ -31,6 +31,7 @@
* @author Sarven Capadisli <csarven@status.net>
* @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index b4810d04a..39a1fd456 100644
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -50,12 +50,13 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
* Constructor
*
* @param Group $group the group for the feed
+ * @param User $cur the current authenticated user, if any
* @param boolean $indent flag to turn indenting on or off
*
* @return void
*/
- function __construct($group, $indent = true) {
- parent::__construct($indent);
+ function __construct($group, $cur = null, $indent = true) {
+ parent::__construct($cur, $indent);
$this->group = $group;
// TRANS: Title in atom group notice feed. %s is a group name.
@@ -95,4 +96,23 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
return $this->group;
}
+ function initFeed()
+ {
+ parent::initFeed();
+
+ $attrs = array();
+
+ if (!empty($this->cur)) {
+ $attrs['member'] = $this->cur->isMember($this->group)
+ ? 'true' : 'false';
+ $attrs['blocked'] = Group_block::isBlocked(
+ $this->group,
+ $this->cur->getProfile()
+ ) ? 'true' : 'false';
+ }
+
+ $attrs['member_count'] = $this->group->getMemberCount();
+
+ $this->element('statusnet:group_info', $attrs, null);
+ }
}
diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index e4df731fe..6ed803ce4 100644
--- a/lib/atomnoticefeed.php
+++ b/lib/atomnoticefeed.php
@@ -44,9 +44,22 @@ if (!defined('STATUSNET'))
*/
class AtomNoticeFeed extends Atom10Feed
{
- function __construct($indent = true) {
+ var $cur;
+
+ /**
+ * Constructor - adds a bunch of XML namespaces we need in our
+ * notice-specific Atom feeds, and allows setting the current
+ * authenticated user (useful for API methods).
+ *
+ * @param User $cur the current authenticated user (optional)
+ * @param boolean $indent Whether to indent XML output
+ *
+ */
+ function __construct($cur = null, $indent = true) {
parent::__construct($indent);
+ $this->cur = $cur;
+
// Feeds containing notice info use these namespaces
$this->addNamespace(
@@ -79,6 +92,11 @@ class AtomNoticeFeed extends Atom10Feed
'ostatus',
'http://ostatus.org/schema/1.0'
);
+
+ $this->addNamespace(
+ 'statusnet',
+ 'http://status.net/schema/api/1/'
+ );
}
/**
@@ -110,7 +128,9 @@ class AtomNoticeFeed extends Atom10Feed
$source = $this->showSource();
$author = $this->showAuthor();
- $this->addEntryRaw($notice->asAtomEntry(false, $source, $author));
+ $cur = empty($this->cur) ? common_current_user() : $this->cur;
+
+ $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur));
}
function showSource()
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index acfcbd75f..785db4915 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -50,13 +50,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
* Constructor
*
* @param User $user the user for the feed
+ * @param User $cur the current authenticated user, if any
* @param boolean $indent flag to turn indenting on or off
*
* @return void
*/
- function __construct($user, $indent = true) {
- parent::__construct($indent);
+ function __construct($user, $cur = null, $indent = true) {
+ parent::__construct($cur, $indent);
$this->user = $user;
if (!empty($user)) {
$profile = $user->getProfile();
diff --git a/lib/authenticationplugin.php b/lib/authenticationplugin.php
index 0a3763e2e..dbdf20629 100644
--- a/lib/authenticationplugin.php
+++ b/lib/authenticationplugin.php
@@ -22,6 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/lib/authorizationplugin.php b/lib/authorizationplugin.php
index 3790bccf4..d71f77243 100644
--- a/lib/authorizationplugin.php
+++ b/lib/authorizationplugin.php
@@ -22,6 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/lib/avatarlink.php b/lib/avatarlink.php
index e67799e2e..7d4256d6e 100644
--- a/lib/avatarlink.php
+++ b/lib/avatarlink.php
@@ -76,8 +76,8 @@ class AvatarLink
$alink = new AvatarLink();
$alink->url = $filename;
$alink->height = $size;
+ $alink->width = $size;
if (!empty($filename)) {
- $alink->width = $size;
$alink->type = self::mediatype($filename);
} else {
$alink->url = User_group::defaultLogo($size);
diff --git a/lib/common.php b/lib/common.php
index 45946c216..72a1b7075 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
//exit with 200 response, if this is checking fancy from the installer
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
-define('STATUSNET_VERSION', '0.9.1');
+define('STATUSNET_VERSION', '0.9.2');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
-define('STATUSNET_CODENAME', 'Everybody Hurts');
+define('STATUSNET_CODENAME', 'King of Birds');
define('AVATAR_PROFILE_SIZE', 96);
define('AVATAR_STREAM_SIZE', 48);
@@ -132,6 +132,12 @@ require_once INSTALLDIR.'/lib/serverexception.php';
//set PEAR error handling to use regular PHP exceptions
function PEAR_ErrorToPEAR_Exception($err)
{
+ //DB_DataObject throws error when an empty set would be returned
+ //That behavior is weird, and not how the rest of StatusNet works.
+ //So just ignore those errors.
+ if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+ return;
+ }
if ($err->getCode()) {
throw new PEAR_Exception($err->getMessage(), $err->getCode());
}
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index b9c14799e..5d62fc56b 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -105,7 +105,9 @@ class ConnectSettingsNav extends Widget
# action => array('prompt', 'title')
$menu = array();
- if (common_config('xmpp', 'enabled')) {
+ $transports = array();
+ Event::handle('GetImTransports', array(&$transports));
+ if ($transports) {
$menu['imsettings'] =
array(_('IM'),
_('Updates by instant messenger (IM)'));
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index 3032e4ec7..3dda9fd1a 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -135,9 +135,7 @@ class DBQueueManager extends QueueManager
if (empty($qi->claimed)) {
$this->_log(LOG_WARNING, "[$queue:item $qi->id] Ignoring failure for unclaimed queue item");
} else {
- $orig = clone($qi);
- $qi->claimed = null;
- $qi->update($orig);
+ $qi->releaseClaim();
}
$this->stats('error', $queue);
diff --git a/lib/default.php b/lib/default.php
index dec08fc06..e0081f316 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -141,10 +141,17 @@ $default =
'dir' => null,
'path'=> null,
'ssl' => null),
+ 'theme_upload' =>
+ array('enabled' => extension_loaded('zip')),
'javascript' =>
array('server' => null,
'path'=> null,
'ssl' => null),
+ 'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins)
+ array('server' => null,
+ 'dir' => null,
+ 'path' => null,
+ 'ssl' => null),
'throttle' =>
array('enabled' => false, // whether to throttle edits; false by default
'count' => 20, // number of allowed messages in timespan
@@ -188,7 +195,8 @@ $default =
'cache' =>
array('base' => null),
'ping' =>
- array('notify' => array()),
+ array('notify' => array(),
+ 'timeout' => 2),
'inboxes' =>
array('enabled' => true), # ignored after 0.9.x
'newuser' =>
@@ -259,6 +267,9 @@ $default =
'linkcolor' => null,
'backgroundimage' => null,
'disposition' => null),
+ 'custom_css' =>
+ array('enabled' => true,
+ 'css' => ''),
'notice' =>
array('contentlimit' => null),
'message' =>
@@ -286,6 +297,7 @@ $default =
'OStatus' => null,
'WikiHashtags' => null,
'RSSCloud' => null,
+ 'ClientSideShorten' => null,
'OpenID' => null),
),
'pluginlist' => array(),
@@ -307,5 +319,8 @@ $default =
'url' =>
array('shortener' => 'ur1.ca',
'maxlength' => 25,
- 'maxnoticelength' => -1)
+ 'maxnoticelength' => -1),
+ 'http' => // HTTP client settings when contacting other sites
+ array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+ ),
);
diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php
index d2be7a92c..8f4b72d5c 100644
--- a/lib/distribqueuehandler.php
+++ b/lib/distribqueuehandler.php
@@ -49,19 +49,22 @@ class DistribQueueHandler
}
/**
- * Here's the meat of your queue handler -- you're handed a Notice
- * object, which you may do as you will with.
+ * Handle distribution of a notice after we've saved it:
+ * @li add to local recipient inboxes
+ * @li send email notifications to local @-reply targets
+ * @li run final EndNoticeSave plugin events
+ * @li put any remaining post-processing into the queues
*
* If this function indicates failure, a warning will be logged
* and the item is placed back in the queue to be re-run.
*
+ * @fixme addToInboxes is known to fail sometimes with large recipient sets
+ *
* @param Notice $notice
* @return boolean true on success, false on failure
*/
function handle($notice)
{
- // XXX: do we need to change this for remote users?
-
try {
$notice->addToInboxes();
} catch (Exception $e) {
@@ -69,6 +72,12 @@ class DistribQueueHandler
}
try {
+ $notice->sendReplyNotifications();
+ } catch (Exception $e) {
+ $this->logit($notice, $e);
+ }
+
+ try {
Event::handle('EndNoticeSave', array($notice));
// Enqueue for other handlers
} catch (Exception $e) {
diff --git a/lib/httpclient.php b/lib/httpclient.php
index 384626ae0..b69f718e5 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -132,7 +132,19 @@ class HTTPClient extends HTTP_Request2
// ought to be investigated to see if we can handle
// it gracefully in that case as well.
$this->config['protocol_version'] = '1.0';
-
+
+ // Default state of OpenSSL seems to have no trusted
+ // SSL certificate authorities, which breaks hostname
+ // verification and means we have a hard time communicating
+ // with other sites' HTTPS interfaces.
+ //
+ // Turn off verification unless we've configured a CA bundle.
+ if (common_config('http', 'ssl_cafile')) {
+ $this->config['ssl_cafile'] = common_config('http', 'ssl_cafile');
+ } else {
+ $this->config['ssl_verify_peer'] = false;
+ }
+
parent::__construct($url, $method, $config);
$this->setHeader('User-Agent', $this->userAgent());
}
diff --git a/lib/implugin.php b/lib/implugin.php
index 7302859a4..dafb8a416 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -107,10 +107,15 @@ abstract class ImPlugin extends Plugin
* receive a raw message
* Raw IM data is taken from the incoming queue, and passed to this function.
* It should parse the raw message and call handle_incoming()
+ *
+ * Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should
+ * be used for temporary failures only. For permanent failures such as
+ * unrecognized addresses, return true to indicate your processing has
+ * completed.
*
* @param object $data raw IM data
*
- * @return boolean success value
+ * @return boolean true if processing completed, false for temporary failures
*/
abstract function receive_raw_message($data);
@@ -185,9 +190,12 @@ abstract class ImPlugin extends Plugin
*/
function get_user_im_prefs_from_screenname($screenname)
{
- if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'screenname' => $screenname) )){
+ $user_im_prefs = User_im_prefs::pkeyGet(
+ array('transport' => $this->transport,
+ 'screenname' => $this->normalize($screenname)));
+ if ($user_im_prefs) {
return $user_im_prefs;
- }else{
+ } else {
return false;
}
}
@@ -203,9 +211,9 @@ abstract class ImPlugin extends Plugin
function get_screenname($user)
{
$user_im_prefs = $this->get_user_im_prefs_from_user($user);
- if($user_im_prefs){
+ if ($user_im_prefs) {
return $user_im_prefs->screenname;
- }else{
+ } else {
return false;
}
}
@@ -220,9 +228,12 @@ abstract class ImPlugin extends Plugin
*/
function get_user_im_prefs_from_user($user)
{
- if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'user_id' => $user->id) )){
+ $user_im_prefs = User_im_prefs::pkeyGet(
+ array('transport' => $this->transport,
+ 'user_id' => $user->id));
+ if ($user_im_prefs){
return $user_im_prefs;
- }else{
+ } else {
return false;
}
}
@@ -608,8 +619,13 @@ abstract class ImPlugin extends Plugin
function initialize()
{
+ if( ! common_config('queue', 'enabled'))
+ {
+ throw new ServerException("Queueing must be enabled to use IM plugins");
+ }
+
if(is_null($this->transport)){
- throw new Exception('transport cannot be null');
+ throw new ServerException('transport cannot be null');
}
}
}
diff --git a/lib/installer.php b/lib/installer.php
index d0e46f95c..bd9d69cd4 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -32,6 +32,7 @@
* @author Sarven Capadisli <csarven@status.net>
* @author Tom Adams <tom@holizz.com>
* @author Zach Copley <zach@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license GNU Affero General Public License http://www.gnu.org/licenses/
* @version 0.9.x
* @link http://status.net
@@ -51,7 +52,7 @@ abstract class Installer
public static $dbModules = array(
'mysql' => array(
'name' => 'MySQL',
- 'check_module' => 'mysql', // mysqli?
+ 'check_module' => 'mysqli',
'installer' => 'mysql_db_installer',
),
'pgsql' => array(
@@ -81,9 +82,12 @@ abstract class Installer
{
$pass = true;
- if (file_exists(INSTALLDIR.'/config.php')) {
- $this->warning('Config file "config.php" already exists.');
- $pass = false;
+ $config = INSTALLDIR.'/config.php';
+ if (file_exists($config)) {
+ if (!is_writable($config) || filesize($config) > 0) {
+ $this->warning('Config file "config.php" already exists.');
+ $pass = false;
+ }
}
if (version_compare(PHP_VERSION, '5.2.3', '<')) {
@@ -128,6 +132,7 @@ abstract class Installer
$pass = false;
}
+ // @fixme this check seems to be insufficient with Windows ACLs
if (!is_writable(INSTALLDIR)) {
$this->warning(sprintf('Cannot write config file to: <code>%s</code></p>', INSTALLDIR),
sprintf('On your server, try this command: <code>chmod a+w %s</code>', INSTALLDIR));
@@ -341,7 +346,6 @@ abstract class Installer
* @param string $password
* @return mixed array of database connection params on success, false on failure
*
- * @fixme be consistent about using mysqli vs mysql!
* @fixme escape things in the connection string in case we have a funny pass etc
*/
function Mysql_Db_installer($host, $database, $username, $password)
@@ -349,14 +353,13 @@ abstract class Installer
$this->updateStatus("Starting installation...");
$this->updateStatus("Checking database...");
- $conn = mysql_connect($host, $username, $password);
- if (!$conn) {
+ $conn = mysqli_init();
+ if (!$conn->real_connect($host, $username, $password)) {
$this->updateStatus("Can't connect to server '$host' as '$username'.", true);
return false;
}
$this->updateStatus("Changing to database...");
- $res = mysql_select_db($database, $conn);
- if (!$res) {
+ if (!$conn->select_db($database)) {
$this->updateStatus("Can't change to database.", true);
return false;
}
@@ -411,6 +414,10 @@ abstract class Installer
"\$config['db']['database'] = '{$this->db['database']}';\n\n".
($this->db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
"\$config['db']['type'] = '{$this->db['type']}';\n\n";
+
+ // Normalize line endings for Windows servers
+ $cfg = str_replace("\n", PHP_EOL, $cfg);
+
// write configuration file out to install directory
$res = file_put_contents(INSTALLDIR.'/config.php', $cfg);
@@ -438,9 +445,9 @@ abstract class Installer
// FIXME: use PEAR::DB or PDO instead of our own switch
switch ($type) {
case 'mysqli':
- $res = mysql_query($stmt, $conn);
+ $res = $conn->query($stmt);
if ($res === false) {
- $error = mysql_error();
+ $error = $conn->error;
}
break;
case 'pgsql':
diff --git a/lib/language.php b/lib/language.php
index 8009adc9b..1805707ad 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -61,7 +61,7 @@ if (!function_exists('dpgettext')) {
* Not currently exposed in PHP's gettext module; implemented to be compat
* with gettext.h's macros.
*
- * @param string $domain domain identifier, or null for default domain
+ * @param string $domain domain identifier
* @param string $context context identifier, should be some key like "menu|file"
* @param string $msgid English source text
* @return string original or translated message
@@ -106,7 +106,7 @@ if (!function_exists('dnpgettext')) {
* Not currently exposed in PHP's gettext module; implemented to be compat
* with gettext.h's macros.
*
- * @param string $domain domain identifier, or null for default domain
+ * @param string $domain domain identifier
* @param string $context context identifier, should be some key like "menu|file"
* @param string $msg singular English source text
* @param string $plural plural English source text
@@ -180,7 +180,11 @@ function _m($msg/*, ...*/)
}
/**
- * Looks for which plugin we've been called from to set the gettext domain.
+ * Looks for which plugin we've been called from to set the gettext domain;
+ * if not in a plugin subdirectory, we'll use the default 'statusnet'.
+ *
+ * Note: we can't return null for default domain since most of the PHP gettext
+ * wrapper functions turn null into "" before passing to the backend library.
*
* @param array $backtrace debug_backtrace() output
* @return string
@@ -206,12 +210,19 @@ function _mdomain($backtrace)
if (DIRECTORY_SEPARATOR !== '/') {
$path = strtr($path, DIRECTORY_SEPARATOR, '/');
}
- $cut = strpos($path, '/plugins/');
- if ($cut) {
- $cut += strlen('/plugins/');
+ $plug = strpos($path, '/plugins/');
+ if ($plug === false) {
+ // We're not in a plugin; return default domain.
+ return 'statusnet';
+ } else {
+ $cut = $plug + 9;
$cut2 = strpos($path, '/', $cut);
- if ($cut && $cut2) {
- $final = substr($path, $cut, $cut2 - $cut);
+ if ($cut2) {
+ $cached[$path] = substr($path, $cut, $cut2 - $cut);
+ } else {
+ // We might be running directly from the plugins dir?
+ // If so, there's no place to store locale info.
+ return 'statusnet';
}
}
$cached[$path] = $final;
diff --git a/lib/liberalstomp.php b/lib/liberalstomp.php
index 3d38953fd..70c22c17e 100644
--- a/lib/liberalstomp.php
+++ b/lib/liberalstomp.php
@@ -147,5 +147,30 @@ class LiberalStomp extends Stomp
}
return $frame;
}
-}
+
+ /**
+ * Write frame to server
+ *
+ * @param StompFrame $stompFrame
+ */
+ protected function _writeFrame (StompFrame $stompFrame)
+ {
+ if (!is_resource($this->_socket)) {
+ require_once 'Stomp/Exception.php';
+ throw new StompException('Socket connection hasn\'t been established');
+ }
+
+ $data = $stompFrame->__toString();
+
+ // Make sure the socket's in a writable state; if not, wait a bit.
+ stream_set_blocking($this->_socket, 1);
+
+ $r = fwrite($this->_socket, $data, strlen($data));
+ stream_set_blocking($this->_socket, 0);
+ if ($r === false || $r == 0) {
+ $this->_reconnect();
+ $this->_writeFrame($stompFrame);
+ }
+ }
+ }
diff --git a/lib/mail.php b/lib/mail.php
index c38d9f2f5..ab5742e33 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -224,9 +224,6 @@ function mail_subscribe_notify_profile($listenee, $other)
if ($other->hasRight(Right::EMAILONSUBSCRIBE) &&
$listenee->email && $listenee->emailnotifysub) {
- // use the recipient's localization
- common_init_locale($listenee->language);
-
$profile = $listenee->getProfile();
$name = $profile->getBestName();
@@ -236,6 +233,9 @@ function mail_subscribe_notify_profile($listenee, $other)
$recipients = $listenee->email;
+ // use the recipient's localization
+ common_switch_locale($listenee->language);
+
$headers = _mail_prepare_headers('subscribe', $listenee->nickname, $other->nickname);
$headers['From'] = mail_notify_from();
$headers['To'] = $name . ' <' . $listenee->email . '>';
@@ -245,6 +245,11 @@ function mail_subscribe_notify_profile($listenee, $other)
$other->getBestName(),
common_config('site', 'name'));
+ $blocklink = sprintf(_("If you believe this account is being used abusively, " .
+ "you can block them from your subscribers list and " .
+ "report as spam to site administrators at %s"),
+ common_local_url('block', array('profileid' => $other->id)));
+
// TRANS: Main body of new-subscriber notification e-mail
$body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
"\t".'%3$s'."\n\n".
@@ -264,14 +269,15 @@ function mail_subscribe_notify_profile($listenee, $other)
($other->homepage) ?
// TRANS: Profile info line in new-subscriber notification e-mail
sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '',
- ($other->bio) ?
+ (($other->bio) ?
// TRANS: Profile info line in new-subscriber notification e-mail
- sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '',
+ sprintf(_("Bio: %s"), $other->bio) . "\n" : '') .
+ "\n\n" . $blocklink . "\n",
common_config('site', 'name'),
common_local_url('emailsettings'));
// reset localization
- common_init_locale();
+ common_switch_locale();
mail_send($recipients, $headers, $body);
}
}
@@ -473,7 +479,7 @@ function mail_confirm_sms($code, $nickname, $address)
function mail_notify_nudge($from, $to)
{
- common_init_locale($to->language);
+ common_switch_locale($to->language);
// TRANS: Subject for 'nudge' notification email
$subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname);
@@ -491,7 +497,7 @@ function mail_notify_nudge($from, $to)
$from->nickname,
common_local_url('all', array('nickname' => $to->nickname)),
common_config('site', 'name'));
- common_init_locale();
+ common_switch_locale();
$headers = _mail_prepare_headers('nudge', $to->nickname, $from->nickname);
@@ -525,7 +531,7 @@ function mail_notify_message($message, $from=null, $to=null)
return true;
}
- common_init_locale($to->language);
+ common_switch_locale($to->language);
// TRANS: Subject for direct-message notification email
$subject = sprintf(_('New private message from %s'), $from->nickname);
@@ -549,7 +555,7 @@ function mail_notify_message($message, $from=null, $to=null)
$headers = _mail_prepare_headers('message', $to->nickname, $from->nickname);
- common_init_locale();
+ common_switch_locale();
return mail_to_user($to, $subject, $body, $headers);
}
@@ -577,7 +583,7 @@ function mail_notify_fave($other, $user, $notice)
$bestname = $profile->getBestName();
- common_init_locale($other->language);
+ common_switch_locale($other->language);
// TRANS: Subject for favorite notification email
$subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname);
@@ -605,7 +611,7 @@ function mail_notify_fave($other, $user, $notice)
$headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname);
- common_init_locale();
+ common_switch_locale();
mail_to_user($other, $subject, $body, $headers);
}
@@ -636,7 +642,7 @@ function mail_notify_attn($user, $notice)
$bestname = $sender->getBestName();
- common_init_locale($user->language);
+ common_switch_locale($user->language);
if ($notice->hasConversation()) {
$conversationUrl = common_local_url('conversation',
@@ -679,7 +685,7 @@ function mail_notify_attn($user, $notice)
$headers = _mail_prepare_headers('mention', $user->nickname, $sender->nickname);
- common_init_locale();
+ common_switch_locale();
mail_to_user($user, $subject, $body, $headers);
}
diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index 890f6d5b4..e9ba41839 100644
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -265,6 +265,10 @@ class MailHandler
if (preg_match('/^\s*Begin\s+forward/', $line)) {
break;
}
+ // skip everything after a blank line if we already have content
+ if ($output !== '' && $line === '') {
+ break;
+ }
$output .= ' ' . $line;
}
diff --git a/lib/mediafile.php b/lib/mediafile.php
index 1c96c42d7..c96c78ab5 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -180,7 +180,8 @@ class MediaFile
return;
}
- $mimetype = MediaFile::getUploadedFileType($_FILES[$param]['tmp_name']);
+ $mimetype = MediaFile::getUploadedFileType($_FILES[$param]['tmp_name'],
+ $_FILES[$param]['name']);
$filename = null;
@@ -241,19 +242,41 @@ class MediaFile
return new MediaFile($user, $filename, $mimetype);
}
- static function getUploadedFileType($f) {
+ /**
+ * Attempt to identify the content type of a given file.
+ *
+ * @param mixed $f file handle resource, or filesystem path as string
+ * @param string $originalFilename (optional) for extension-based detection
+ * @return string
+ *
+ * @fixme is this an internal or public method? It's called from GetFileAction
+ * @fixme this seems to tie a front-end error message in, kinda confusing
+ * @fixme this looks like it could return a PEAR_Error in some cases, if
+ * type can't be identified and $config['attachments']['supported'] is true
+ *
+ * @throws ClientException if type is known, but not supported for local uploads
+ */
+ static function getUploadedFileType($f, $originalFilename=false) {
require_once 'MIME/Type.php';
+ require_once 'MIME/Type/Extension.php';
+ $mte = new MIME_Type_Extension();
$cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
$cmd = common_config('attachments', 'filecommand');
$filetype = null;
+ // If we couldn't get a clear type from the file extension,
+ // we'll go ahead and try checking the content. Content checks
+ // are unambiguous for most image files, but nearly useless
+ // for office document formats.
+
if (is_string($f)) {
// assuming a filename
$filetype = MIME_Type::autoDetect($f);
+
} else {
// assuming a filehandle
@@ -262,7 +285,32 @@ class MediaFile
$filetype = MIME_Type::autoDetect($stream['uri']);
}
- if (common_config('attachments', 'supported') === true || in_array($filetype, common_config('attachments', 'supported'))) {
+ // The content-based sources for MIME_Type::autoDetect()
+ // are wildly unreliable for office-type documents. If we've
+ // gotten an unclear reponse back or just couldn't identify it,
+ // we'll try detecting a type from its extension...
+ $unclearTypes = array('application/octet-stream',
+ 'application/vnd.ms-office',
+ 'application/zip');
+
+ if ($originalFilename && (!$filetype || in_array($filetype, $unclearTypes))) {
+ $type = $mte->getMIMEType($originalFilename);
+ if (is_string($type)) {
+ $filetype = $type;
+ }
+ }
+
+ $supported = common_config('attachments', 'supported');
+ if (is_array($supported)) {
+ // Normalize extensions to mime types
+ foreach ($supported as $i => $entry) {
+ if (strpos($entry, '/') === false) {
+ common_log(LOG_INFO, "sample.$entry");
+ $supported[$i] = $mte->getMIMEType("sample.$entry");
+ }
+ }
+ }
+ if ($supported === true || in_array($filetype, $supported)) {
return $filetype;
}
$media = MIME_Type::getMedia($filetype);
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 5265326b2..432ea78d5 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -488,54 +488,46 @@ class NoticeListItem extends Widget
function showNoticeSource()
{
- if ($this->notice->source) {
+ $ns = $this->notice->getSource();
+
+ if ($ns) {
+ $source_name = _($ns->code);
$this->out->text(' ');
$this->out->elementStart('span', 'source');
$this->out->text(_('from'));
- $source_name = _($this->notice->source);
$this->out->text(' ');
- switch ($this->notice->source) {
- case 'web':
- case 'xmpp':
- case 'mail':
- case 'omb':
- case 'system':
- case 'api':
- $this->out->element('span', 'device', $source_name);
- break;
- default:
+ $name = $source_name;
+ $url = $ns->url;
+ $title = null;
+
+ if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) {
$name = $source_name;
- $url = null;
-
- if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) {
- $ns = Notice_source::staticGet($this->notice->source);
-
- if ($ns) {
- $name = $ns->name;
- $url = $ns->url;
- } else {
- $app = Oauth_application::staticGet('name', $this->notice->source);
- if ($app) {
- $name = $app->name;
- $url = $app->source_url;
- }
- }
- }
- Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title));
-
- if (!empty($name) && !empty($url)) {
- $this->out->elementStart('span', 'device');
- $this->out->element('a', array('href' => $url,
- 'rel' => 'external',
- 'title' => $title),
- $name);
- $this->out->elementEnd('span');
- } else {
- $this->out->element('span', 'device', $name);
+ $url = $ns->url;
+ }
+ Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title));
+
+ // if $ns->name and $ns->url are populated we have
+ // configured a source attr somewhere
+ if (!empty($name) && !empty($url)) {
+
+ $this->out->elementStart('span', 'device');
+
+ $attrs = array(
+ 'href' => $url,
+ 'rel' => 'external'
+ );
+
+ if (!empty($title)) {
+ $attrs['title'] = $title;
}
- break;
+
+ $this->out->element('a', $attrs, $name);
+ $this->out->elementEnd('span');
+ } else {
+ $this->out->element('span', 'device', $name);
}
+
$this->out->elementEnd('span');
}
}
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 715065d77..272f7eff6 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -41,6 +41,7 @@ if (!defined('STATUSNET')) {
* @category Database
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
+ * @author Brenda Wallace <shiny@cpan.org>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -79,7 +80,6 @@ class PgsqlSchema extends Schema
$row = array();
while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-// var_dump($row);
$cd = new ColumnDef();
$cd->name = $row['field'];
@@ -143,6 +143,7 @@ class PgsqlSchema extends Schema
$uniques = array();
$primary = array();
$indices = array();
+ $onupdate = array();
$sql = "CREATE TABLE $name (\n";
@@ -155,7 +156,6 @@ class PgsqlSchema extends Schema
}
$sql .= $this->_columnSql($cd);
-
switch ($cd->key) {
case 'UNI':
$uniques[] = $cd->name;
@@ -170,13 +170,7 @@ class PgsqlSchema extends Schema
}
if (count($primary) > 0) { // it really should be...
- $sql .= ",\n primary key (" . implode(',', $primary) . ")";
- }
-
-
-
- foreach ($indices as $i) {
- $sql .= ",\nindex {$name}_{$i}_idx ($i)";
+ $sql .= ",\n PRIMARY KEY (" . implode(',', $primary) . ")";
}
$sql .= "); ";
@@ -185,10 +179,14 @@ class PgsqlSchema extends Schema
foreach ($uniques as $u) {
$sql .= "\n CREATE index {$name}_{$u}_idx ON {$name} ($u); ";
}
+
+ foreach ($indices as $i) {
+ $sql .= "CREATE index {$name}_{$i}_idx ON {$name} ($i)";
+ }
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
- throw new Exception($res->getMessage());
+ throw new Exception($res->getMessage(). ' SQL was '. $sql);
}
return true;
@@ -223,7 +221,7 @@ class PgsqlSchema extends Schema
*/
private function _columnTypeTranslation($type) {
$map = array(
- 'datetime' => 'timestamp'
+ 'datetime' => 'timestamp',
);
if(!empty($map[$type])) {
return $map[$type];
@@ -324,7 +322,7 @@ class PgsqlSchema extends Schema
public function modifyColumn($table, $columndef)
{
- $sql = "ALTER TABLE $table MODIFY COLUMN " .
+ $sql = "ALTER TABLE $table ALTER COLUMN TYPE " .
$this->_columnSql($columndef);
$res = $this->conn->query($sql);
@@ -397,16 +395,17 @@ class PgsqlSchema extends Schema
$todrop = array_diff($cur, $new);
$same = array_intersect($new, $cur);
$tomod = array();
-
foreach ($same as $m) {
$curCol = $this->_byName($td->columns, $m);
$newCol = $this->_byName($columns, $m);
+
if (!$newCol->equals($curCol)) {
- $tomod[] = $newCol->name;
+ // BIG GIANT TODO!
+ // stop it detecting different types and trying to modify on every page request
+// $tomod[] = $newCol->name;
}
}
-
if (count($toadd) + count($todrop) + count($tomod) == 0) {
// nothing to do
return true;
@@ -430,11 +429,12 @@ class PgsqlSchema extends Schema
foreach ($tomod as $columnName) {
$cd = $this->_byName($columns, $columnName);
- $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd);
+ /* brute force */
+ $phrase[] = 'DROP COLUMN ' . $columnName;
+ $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
}
$sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
-
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
@@ -496,12 +496,21 @@ class PgsqlSchema extends Schema
*
* @return string correct SQL for that column
*/
-
private function _columnSql($cd)
{
$sql = "{$cd->name} ";
$type = $this->_columnTypeTranslation($cd->type);
+ //handle those mysql enum fields that postgres doesn't support
+ if (preg_match('!^enum!', $type)) {
+ $allowed_values = preg_replace('!^enum!', '', $type);
+ $sql .= " text check ({$cd->name} in $allowed_values)";
+ return $sql;
+ }
+ if (!empty($cd->auto_increment)) {
+ $type = "bigserial"; // FIXME: creates the wrong name for the sequence for some internal sequence-lookup function, so better fix this to do the real 'create sequence' dance.
+ }
+
if (!empty($cd->size)) {
$sql .= "{$type}({$cd->size}) ";
} else {
@@ -513,14 +522,10 @@ class PgsqlSchema extends Schema
} else {
$sql .= ($cd->nullable) ? "null " : "not null ";
}
-
- if (!empty($cd->auto_increment)) {
- $sql .= " auto_increment ";
- }
- if (!empty($cd->extra)) {
- $sql .= "{$cd->extra} ";
- }
+// if (!empty($cd->extra)) {
+// $sql .= "{$cd->extra} ";
+// }
return $sql;
}
diff --git a/lib/ping.php b/lib/ping.php
index 735af9ef1..be2933ae3 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -45,7 +45,15 @@ function ping_broadcast_notice($notice) {
$tags));
$request = HTTPClient::start();
- $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
+ $request->setConfig('connect_timeout', common_config('ping', 'timeout'));
+ $request->setConfig('timeout', common_config('ping', 'timeout'));
+ try {
+ $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
+ } catch (Exception $e) {
+ common_log(LOG_ERR,
+ "Exception pinging $notify_url: " . $e->getMessage());
+ continue;
+ }
if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) {
common_log(LOG_WARNING,
diff --git a/lib/plugin.php b/lib/plugin.php
index 65ccdafbb..f63bdf309 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -91,6 +91,7 @@ class Plugin
$path = INSTALLDIR . "/plugins/$name/locale";
if (file_exists($path) && is_dir($path)) {
bindtextdomain($name, $path);
+ bind_textdomain_codeset($name, 'UTF-8');
}
}
}
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 296ddbbb5..f70a972ef 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -72,7 +72,7 @@ class PopularNoticeSection extends NoticeSection
$qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
'notice.rendered,notice.url,notice.created,notice.modified,' .
'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' .
- 'notice.lat,notice.lon,location_id,location_ns' .
+ 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of' .
' ORDER BY weight DESC';
$offset = 0;
diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index 0ffafe5fb..51c89a922 100644
--- a/lib/profileformaction.php
+++ b/lib/profileformaction.php
@@ -60,7 +60,16 @@ class ProfileFormAction extends RedirectingAction
$this->checkSessionToken();
if (!common_logged_in()) {
- $this->clientError(_('Not logged in.'));
+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $this->clientError(_('Not logged in.'));
+ } else {
+ // Redirect to login.
+ common_set_returnto($this->selfUrl());
+ $user = common_current_user();
+ if (Event::handle('RedirectToLogin', array($this, $user))) {
+ common_redirect(common_local_url('login'), 303);
+ }
+ }
return false;
}
@@ -97,7 +106,7 @@ class ProfileFormAction extends RedirectingAction
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();
- $this->returnToArgs();
+ $this->returnToPrevious();
}
}
diff --git a/lib/redirectingaction.php b/lib/redirectingaction.php
index f11585274..3a358f891 100644
--- a/lib/redirectingaction.php
+++ b/lib/redirectingaction.php
@@ -53,12 +53,13 @@ class RedirectingAction extends Action
*
* To be called only after successful processing.
*
- * @fixme rename this -- it obscures Action::returnToArgs() which
- * returns a list of arguments, and is a bit confusing.
+ * Note: this was named returnToArgs() up through 0.9.2, which
+ * caused problems because there's an Action::returnToArgs()
+ * already which does something different.
*
* @return void
*/
- function returnToArgs()
+ function returnToPrevious()
{
// Now, gotta figure where we go back to
$action = false;
@@ -77,7 +78,7 @@ class RedirectingAction extends Action
if ($action) {
common_redirect(common_local_url($action, $args, $params), 303);
} else {
- $url = $this->defaultReturnToUrl();
+ $url = $this->defaultReturnTo();
}
common_redirect($url, 303);
}
diff --git a/lib/router.php b/lib/router.php
index a040abb83..ca3c2e880 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -136,6 +136,11 @@ class Router
$m->connect('main/'.$a, array('action' => $a));
}
+ // Also need a block variant accepting ID on URL for mail links
+ $m->connect('main/block/:profileid',
+ array('action' => 'block'),
+ array('profileid' => '[0-9]+'));
+
$m->connect('main/sup/:seconds', array('action' => 'sup'),
array('seconds' => '[0-9]+'));
@@ -258,7 +263,7 @@ class Router
$m->connect('tag', array('action' => 'publictagcloud'));
$m->connect('tag/:tag/rss',
array('action' => 'tagrss'),
- array('tag' => '[a-zA-Z0-9]+'));
+ array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('tag/:tag',
array('action' => 'tag'),
array('tag' => '[\pL\pN_\-\.]{1,64}'));
@@ -535,7 +540,7 @@ class Router
$m->connect('api/favorites/:id.:format',
array('action' => 'ApiTimelineFavorites',
'id' => '[a-zA-Z0-9]+',
- 'format' => '(xmljson|rss|atom)'));
+ 'format' => '(xml|json|rss|atom)'));
$m->connect('api/favorites/create/:id.:format',
array('action' => 'ApiFavoriteCreate',
@@ -592,7 +597,7 @@ class Router
$m->connect('api/statusnet/groups/timeline/:id.:format',
array('action' => 'ApiTimelineGroup',
'id' => '[a-zA-Z0-9]+',
- 'format' => '(xmljson|rss|atom)'));
+ 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statusnet/groups/show.:format',
array('action' => 'ApiGroupShow',
@@ -650,10 +655,16 @@ class Router
$m->connect('api/statusnet/groups/create.:format',
array('action' => 'ApiGroupCreate',
'format' => '(xml|json)'));
+
+ $m->connect('api/statusnet/groups/update/:id.:format',
+ array('action' => 'ApiGroupProfileUpdate',
+ 'id' => '[a-zA-Z0-9]+',
+ 'format' => '(xml|json)'));
+
// Tags
$m->connect('api/statusnet/tags/timeline/:tag.:format',
array('action' => 'ApiTimelineTag',
- 'format' => '(xmljson|rss|atom)'));
+ 'format' => '(xml|json|rss|atom)'));
// media related
$m->connect(
@@ -662,9 +673,9 @@ class Router
);
// search
- $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
- $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
- $m->connect('api/trends.json', array('action' => 'twitapitrends'));
+ $m->connect('api/search.atom', array('action' => 'ApiSearchAtom'));
+ $m->connect('api/search.json', array('action' => 'ApiSearchJSON'));
+ $m->connect('api/trends.json', array('action' => 'ApiTrends'));
$m->connect('api/oauth/request_token',
array('action' => 'apioauthrequesttoken'));
@@ -751,12 +762,12 @@ class Router
$m->connect('tag/:tag/rss',
array('action' => 'userrss',
'nickname' => $nickname),
- array('tag' => '[a-zA-Z0-9]+'));
+ array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('tag/:tag',
array('action' => 'showstream',
'nickname' => $nickname),
- array('tag' => '[a-zA-Z0-9]+'));
+ array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('rsd.xml',
array('action' => 'rsd',
@@ -817,12 +828,12 @@ class Router
$m->connect(':nickname/tag/:tag/rss',
array('action' => 'userrss'),
array('nickname' => '[a-zA-Z0-9]{1,64}'),
- array('tag' => '[a-zA-Z0-9]+'));
+ array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect(':nickname/tag/:tag',
array('action' => 'showstream'),
array('nickname' => '[a-zA-Z0-9]{1,64}'),
- array('tag' => '[a-zA-Z0-9]+'));
+ array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect(':nickname/rsd.xml',
array('action' => 'rsd'),
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 5d5c7ccfb..91faa8c36 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -115,14 +115,27 @@ class StompQueueManager extends QueueManager
*
* @param mixed $object
* @param string $queue
+ * @param string $siteNickname optional override to drop into another site's queue
*
* @return boolean true on success
* @throws StompException on connection or send error
*/
- public function enqueue($object, $queue)
+ public function enqueue($object, $queue, $siteNickname=null)
{
$this->_connect();
- return $this->_doEnqueue($object, $queue, $this->defaultIdx);
+ if (common_config('queue', 'stomp_enqueue_on')) {
+ // We're trying to force all writes to a single server.
+ // WARNING: this might do odd things if that server connection dies.
+ $idx = array_search(common_config('queue', 'stomp_enqueue_on'),
+ $this->servers);
+ if ($idx === false) {
+ common_log(LOG_ERR, 'queue stomp_enqueue_on setting does not match our server list.');
+ $idx = $this->defaultIdx;
+ }
+ } else {
+ $idx = $this->defaultIdx;
+ }
+ return $this->_doEnqueue($object, $queue, $idx, $siteNickname);
}
/**
@@ -132,10 +145,10 @@ class StompQueueManager extends QueueManager
* @return boolean true on success
* @throws StompException on connection or send error
*/
- protected function _doEnqueue($object, $queue, $idx)
+ protected function _doEnqueue($object, $queue, $idx, $siteNickname=null)
{
$rep = $this->logrep($object);
- $envelope = array('site' => common_config('site', 'nickname'),
+ $envelope = array('site' => $siteNickname ? $siteNickname : common_config('site', 'nickname'),
'handler' => $queue,
'payload' => $this->encode($object));
$msg = serialize($envelope);
diff --git a/lib/theme.php b/lib/theme.php
index 0be8c3b9d..a9d0cbc84 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -38,6 +38,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* Themes are directories with some expected sub-directories and files
* in them. They're found in either local/theme (for locally-installed themes)
* or theme/ subdir of installation dir.
+ *
+ * Note that the 'local' directory can be overridden as $config['local']['path']
+ * and $config['local']['dir'] etc.
*
* This used to be a couple of functions, but for various reasons it's nice
* to have a class instead.
@@ -76,7 +79,7 @@ class Theme
if (file_exists($fulldir) && is_dir($fulldir)) {
$this->dir = $fulldir;
- $this->path = common_path('local/theme/'.$name.'/');
+ $this->path = $this->relativeThemePath('local', 'local', 'theme/' . $name);
return;
}
@@ -89,42 +92,63 @@ class Theme
if (file_exists($fulldir) && is_dir($fulldir)) {
$this->dir = $fulldir;
+ $this->path = $this->relativeThemePath('theme', 'theme', $name);
+ }
+ }
- $path = common_config('theme', 'path');
+ /**
+ * Build a full URL to the given theme's base directory, possibly
+ * using an offsite theme server path.
+ *
+ * @param string $group configuration section name to pull paths from
+ * @param string $fallbackSubdir default subdirectory under INSTALLDIR
+ * @param string $name theme name
+ *
+ * @return string URL
+ *
+ * @todo consolidate code with that for other customizable paths
+ */
- if (empty($path)) {
- $path = common_config('site', 'path') . '/theme/';
- }
+ protected function relativeThemePath($group, $fallbackSubdir, $name)
+ {
+ $path = common_config($group, 'path');
- if ($path[strlen($path)-1] != '/') {
- $path .= '/';
+ if (empty($path)) {
+ $path = common_config('site', 'path') . '/';
+ if ($fallbackSubdir) {
+ $path .= $fallbackSubdir . '/';
}
+ }
- if ($path[0] != '/') {
- $path = '/'.$path;
- }
+ if ($path[strlen($path)-1] != '/') {
+ $path .= '/';
+ }
- $server = common_config('theme', 'server');
+ if ($path[0] != '/') {
+ $path = '/'.$path;
+ }
- if (empty($server)) {
- $server = common_config('site', 'server');
- }
+ $server = common_config($group, 'server');
- $ssl = common_config('theme', 'ssl');
+ if (empty($server)) {
+ $server = common_config('site', 'server');
+ }
- if (is_null($ssl)) { // null -> guess
- if (common_config('site', 'ssl') == 'always' &&
- !common_config('theme', 'server')) {
- $ssl = true;
- } else {
- $ssl = false;
- }
+ $ssl = common_config($group, 'ssl');
+
+ if (is_null($ssl)) { // null -> guess
+ if (common_config('site', 'ssl') == 'always' &&
+ !common_config($group, 'server')) {
+ $ssl = true;
+ } else {
+ $ssl = false;
}
+ }
- $protocol = ($ssl) ? 'https' : 'http';
+ $protocol = ($ssl) ? 'https' : 'http';
- $this->path = $protocol . '://'.$server.$path.$name;
- }
+ $path = $protocol . '://'.$server.$path.$name;
+ return $path;
}
/**
@@ -236,7 +260,13 @@ class Theme
protected static function localRoot()
{
- return INSTALLDIR.'/local/theme';
+ $basedir = common_config('local', 'dir');
+
+ if (empty($basedir)) {
+ $basedir = INSTALLDIR . '/local';
+ }
+
+ return $basedir . '/theme';
}
/**
diff --git a/lib/themeuploader.php b/lib/themeuploader.php
new file mode 100644
index 000000000..370965db0
--- /dev/null
+++ b/lib/themeuploader.php
@@ -0,0 +1,311 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Utilities for theme files and paths
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Paths
+ * @package StatusNet
+ * @author Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+/**
+ * Encapsulation of the validation-and-save process when dealing with
+ * a user-uploaded StatusNet theme archive...
+ *
+ * @todo extract theme metadata from css/display.css
+ * @todo allow saving multiple themes
+ */
+class ThemeUploader
+{
+ protected $sourceFile;
+ protected $isUpload;
+ private $prevErrorReporting;
+
+ public function __construct($filename)
+ {
+ if (!class_exists('ZipArchive')) {
+ throw new Exception(_("This server cannot handle theme uploads without ZIP support."));
+ }
+ $this->sourceFile = $filename;
+ }
+
+ public static function fromUpload($name)
+ {
+ if (!isset($_FILES[$name]['error'])) {
+ throw new ServerException(_("The theme file is missing or the upload failed."));
+ }
+ if ($_FILES[$name]['error'] != UPLOAD_ERR_OK) {
+ throw new ServerException(_("The theme file is missing or the upload failed."));
+ }
+ return new ThemeUploader($_FILES[$name]['tmp_name']);
+ }
+
+ /**
+ * @param string $destDir
+ * @throws Exception on bogus files
+ */
+ public function extract($destDir)
+ {
+ $zip = $this->openArchive();
+
+ // First pass: validate but don't save anything to disk.
+ // Any errors will trip an exception.
+ $this->traverseArchive($zip);
+
+ // Second pass: now that we know we're good, actually extract!
+ $tmpDir = $destDir . '.tmp' . getmypid();
+ $this->traverseArchive($zip, $tmpDir);
+
+ $zip->close();
+
+ if (file_exists($destDir)) {
+ $killDir = $tmpDir . '.old';
+ $this->quiet();
+ $ok = rename($destDir, $killDir);
+ $this->loud();
+ if (!$ok) {
+ common_log(LOG_ERR, "Could not move old custom theme from $destDir to $killDir");
+ throw new ServerException(_("Failed saving theme."));
+ }
+ } else {
+ $killDir = false;
+ }
+
+ $this->quiet();
+ $ok = rename($tmpDir, $destDir);
+ $this->loud();
+ if (!$ok) {
+ common_log(LOG_ERR, "Could not move saved theme from $tmpDir to $destDir");
+ throw new ServerException(_("Failed saving theme."));
+ }
+
+ if ($killDir) {
+ $this->recursiveRmdir($killDir);
+ }
+ }
+
+ /**
+ *
+ */
+ protected function traverseArchive($zip, $outdir=false)
+ {
+ $sizeLimit = 2 * 1024 * 1024; // 2 megabyte space limit?
+ $blockSize = 4096; // estimated; any entry probably takes this much space
+
+ $totalSize = 0;
+ $hasMain = false;
+ $commonBaseDir = false;
+
+ for ($i = 0; $i < $zip->numFiles; $i++) {
+ $data = $zip->statIndex($i);
+ $name = str_replace('\\', '/', $data['name']);
+
+ if (substr($name, -1) == '/') {
+ // A raw directory... skip!
+ continue;
+ }
+
+ // Check the directory structure...
+ $path = pathinfo($name);
+ $dirs = explode('/', $path['dirname']);
+ $baseDir = array_shift($dirs);
+ if ($commonBaseDir === false) {
+ $commonBaseDir = $baseDir;
+ } else {
+ if ($commonBaseDir != $baseDir) {
+ throw new ClientException(_("Invalid theme: bad directory structure."));
+ }
+ }
+
+ foreach ($dirs as $dir) {
+ $this->validateFileOrFolder($dir);
+ }
+
+ // Is this a safe or skippable file?
+ if ($this->skippable($path['filename'], $path['extension'])) {
+ // Documentation and such... booooring
+ continue;
+ } else {
+ $this->validateFile($path['filename'], $path['extension']);
+ }
+
+ $fullPath = $dirs;
+ $fullPath[] = $path['basename'];
+ $localFile = implode('/', $fullPath);
+ if ($localFile == 'css/display.css') {
+ $hasMain = true;
+ }
+
+ $size = $data['size'];
+ $estSize = $blockSize * max(1, intval(ceil($size / $blockSize)));
+ $totalSize += $estSize;
+ if ($totalSize > $sizeLimit) {
+ $msg = sprintf(_("Uploaded theme is too large; " .
+ "must be less than %d bytes uncompressed."),
+ $sizeLimit);
+ throw new ClientException($msg);
+ }
+
+ if ($outdir) {
+ $this->extractFile($zip, $data['name'], "$outdir/$localFile");
+ }
+ }
+
+ if (!$hasMain) {
+ throw new ClientException(_("Invalid theme archive: " .
+ "missing file css/display.css"));
+ }
+ }
+
+ protected function skippable($filename, $ext)
+ {
+ $skip = array('txt', 'rtf', 'doc', 'docx', 'odt');
+ if (strtolower($filename) == 'readme') {
+ return true;
+ }
+ if (in_array(strtolower($ext), $skip)) {
+ return true;
+ }
+ return false;
+ }
+
+ protected function validateFile($filename, $ext)
+ {
+ $this->validateFileOrFolder($filename);
+ $this->validateExtension($ext);
+ // @fixme validate content
+ }
+
+ protected function validateFileOrFolder($name)
+ {
+ if (!preg_match('/^[a-z0-9_-]+$/i', $name)) {
+ $msg = _("Theme contains invalid file or folder name. " .
+ "Stick with ASCII letters, digits, underscore, and minus sign.");
+ throw new ClientException($msg);
+ }
+ return true;
+ }
+
+ protected function validateExtension($ext)
+ {
+ $allowed = array('css', 'png', 'gif', 'jpg', 'jpeg');
+ if (!in_array(strtolower($ext), $allowed)) {
+ $msg = sprintf(_("Theme contains file of type '.%s', " .
+ "which is not allowed."),
+ $ext);
+ throw new ClientException($msg);
+ }
+ return true;
+ }
+
+ /**
+ * @return ZipArchive
+ */
+ protected function openArchive()
+ {
+ $zip = new ZipArchive;
+ $ok = $zip->open($this->sourceFile);
+ if ($ok !== true) {
+ common_log(LOG_ERR, "Error opening theme zip archive: " .
+ "{$this->sourceFile} code: {$ok}");
+ throw new Exception(_("Error opening theme archive."));
+ }
+ return $zip;
+ }
+
+ /**
+ * @param ZipArchive $zip
+ * @param string $from original path inside ZIP archive
+ * @param string $to final destination path in filesystem
+ */
+ protected function extractFile($zip, $from, $to)
+ {
+ $dir = dirname($to);
+ if (!file_exists($dir)) {
+ $this->quiet();
+ $ok = mkdir($dir, 0755, true);
+ $this->loud();
+ if (!$ok) {
+ common_log(LOG_ERR, "Failed to mkdir $dir while uploading theme");
+ throw new ServerException(_("Failed saving theme."));
+ }
+ } else if (!is_dir($dir)) {
+ common_log(LOG_ERR, "Output directory $dir not a directory while uploading theme");
+ throw new ServerException(_("Failed saving theme."));
+ }
+
+ // ZipArchive::extractTo would be easier, but won't let us alter
+ // the directory structure.
+ $in = $zip->getStream($from);
+ if (!$in) {
+ common_log(LOG_ERR, "Couldn't open archived file $from while uploading theme");
+ throw new ServerException(_("Failed saving theme."));
+ }
+ $this->quiet();
+ $out = fopen($to, "wb");
+ $this->loud();
+ if (!$out) {
+ common_log(LOG_ERR, "Couldn't open output file $to while uploading theme");
+ throw new ServerException(_("Failed saving theme."));
+ }
+ while (!feof($in)) {
+ $buffer = fread($in, 65536);
+ fwrite($out, $buffer);
+ }
+ fclose($in);
+ fclose($out);
+ }
+
+ private function quiet()
+ {
+ $this->prevErrorReporting = error_reporting();
+ error_reporting($this->prevErrorReporting & ~E_WARNING);
+ }
+
+ private function loud()
+ {
+ error_reporting($this->prevErrorReporting);
+ }
+
+ private function recursiveRmdir($dir)
+ {
+ $list = dir($dir);
+ while (($file = $list->read()) !== false) {
+ if ($file == '.' || $file == '..') {
+ continue;
+ }
+ $full = "$dir/$file";
+ if (is_dir($full)) {
+ $this->recursiveRmdir($full);
+ } else {
+ unlink($full);
+ }
+ }
+ $list->close();
+ rmdir($dir);
+ }
+
+}
diff --git a/lib/util.php b/lib/util.php
index 1f3aaf711..d8fb3b65e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -34,6 +34,14 @@ function common_user_error($msg, $code=400)
$err->showPage();
}
+/**
+ * This should only be used at setup; processes switching languages
+ * to send text to other users should use common_switch_locale().
+ *
+ * @param string $language Locale language code (optional; empty uses
+ * current user's preference or site default)
+ * @return mixed success
+ */
function common_init_locale($language=null)
{
if(!$language) {
@@ -41,13 +49,24 @@ function common_init_locale($language=null)
}
putenv('LANGUAGE='.$language);
putenv('LANG='.$language);
- return setlocale(LC_ALL, $language . ".utf8",
+ $ok = setlocale(LC_ALL, $language . ".utf8",
$language . ".UTF8",
$language . ".utf-8",
$language . ".UTF-8",
$language);
+
+ return $ok;
}
+/**
+ * Initialize locale and charset settings and gettext with our message catalog,
+ * using the current user's language preference or the site default.
+ *
+ * This should generally only be run at framework initialization; code switching
+ * languages at runtime should call common_switch_language().
+ *
+ * @access private
+ */
function common_init_language()
{
mb_internal_encoding('UTF-8');
@@ -89,6 +108,32 @@ function common_init_language()
$locale_set = common_init_locale($language);
}
+ common_init_gettext();
+}
+
+/**
+ * @access private
+ */
+function common_init_gettext()
+{
+ setlocale(LC_CTYPE, 'C');
+ // So we do not have to make people install the gettext locales
+ $path = common_config('site','locale_path');
+ bindtextdomain("statusnet", $path);
+ bind_textdomain_codeset("statusnet", "UTF-8");
+ textdomain("statusnet");
+}
+
+/**
+ * Switch locale during runtime, and poke gettext until it cries uncle.
+ * Otherwise, sometimes it doesn't actually switch away from the old language.
+ *
+ * @param string $language code for locale ('en', 'fr', 'pt_BR' etc)
+ */
+function common_switch_locale($language=null)
+{
+ common_init_locale($language);
+
setlocale(LC_CTYPE, 'C');
// So we do not have to make people install the gettext locales
$path = common_config('site','locale_path');
@@ -97,6 +142,7 @@ function common_init_language()
textdomain("statusnet");
}
+
function common_timezone()
{
if (common_logged_in()) {
@@ -109,23 +155,38 @@ function common_timezone()
return common_config('site', 'timezone');
}
+function common_valid_language($lang)
+{
+ if ($lang) {
+ // Validate -- we don't want to end up with a bogus code
+ // left over from some old junk.
+ foreach (common_config('site', 'languages') as $code => $info) {
+ if ($info['lang'] == $lang) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
function common_language()
{
+ // Allow ?uselang=xx override, very useful for debugging
+ // and helping translators check usage and context.
+ if (isset($_GET['uselang'])) {
+ $uselang = strval($_GET['uselang']);
+ if (common_valid_language($uselang)) {
+ return $uselang;
+ }
+ }
// If there is a user logged in and they've set a language preference
// then return that one...
if (_have_config() && common_logged_in()) {
$user = common_current_user();
- $user_language = $user->language;
-
- if ($user->language) {
- // Validate -- we don't want to end up with a bogus code
- // left over from some old junk.
- foreach (common_config('site', 'languages') as $code => $info) {
- if ($info['lang'] == $user_language) {
- return $user_language;
- }
- }
+
+ if (common_valid_language($user->language)) {
+ return $user->language;
}
}
@@ -826,7 +887,7 @@ function common_linkify($url) {
return XMLStringer::estring('a', $attrs, $url);
}
-function common_shorten_links($text)
+function common_shorten_links($text, $always = false)
{
common_debug("common_shorten_links() called");
@@ -836,7 +897,7 @@ function common_shorten_links($text)
common_debug("maxLength = $maxLength");
- if (mb_strlen($text) > $maxLength) {
+ if ($always || mb_strlen($text) > $maxLength) {
common_debug("Forcing shortening");
return common_replace_urls_callback($text, array('File_redirection', 'forceShort'));
} else {
@@ -1209,9 +1270,8 @@ function common_enqueue_notice($notice)
$transports[] = 'plugin';
}
- // @fixme move these checks into QueueManager and/or individual handlers
- if ($notice->is_local == Notice::LOCAL_PUBLIC ||
- $notice->is_local == Notice::LOCAL_NONPUBLIC) {
+ // We can skip these for gatewayed notices.
+ if ($notice->isLocal()) {
$transports = array_merge($transports, $localTransports);
}
@@ -1353,7 +1413,7 @@ function common_log_line($priority, $msg)
{
static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR',
'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG');
- return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n";
+ return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . PHP_EOL;
}
function common_request_id()
@@ -1908,6 +1968,15 @@ function common_url_to_nickname($url)
$path = preg_replace('@/$@', '', $parts['path']);
$path = preg_replace('@^/@', '', $path);
$path = basename($path);
+
+ // Hack for MediaWiki user pages, in the form:
+ // http://example.com/wiki/User:Myname
+ // ('User' may be localized.)
+ if (strpos($path, ':')) {
+ $parts = array_filter(explode(':', $path));
+ $path = $parts[count($parts) - 1];
+ }
+
if ($path) {
return common_nicknamize($path);
}
diff --git a/lib/xrdsoutputter.php b/lib/xrdsoutputter.php
index 4b77ed5a3..95dc73300 100644
--- a/lib/xrdsoutputter.php
+++ b/lib/xrdsoutputter.php
@@ -23,6 +23,7 @@
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @copyright 2008 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index b9bae5212..aa82c30f6 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:00+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:02:38+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -21,7 +21,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Toegang"
@@ -83,25 +83,25 @@ msgid "Save"
msgstr "Stoor"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Hierdie bladsy bestaan nie"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -114,7 +114,7 @@ msgid "No such user."
msgstr "Onbekende gebruiker."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s en vriende, bladsy %2$d"
@@ -122,33 +122,33 @@ msgstr "%1$s en vriende, bladsy %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s en vriende"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Voer vir vriende van %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Voer vir vriende van %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Voer vir vriende van %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -156,7 +156,7 @@ msgstr ""
"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
"nie."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -164,14 +164,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,64 +179,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "U en vriende"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Opdaterings van %1$s en vriende op %2$s."
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Die API-funksie is nie gevind nie."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Hierdie metode benodig 'n POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Kon nie die gebruiker opdateer nie."
@@ -256,7 +256,7 @@ msgstr "Kon nie die profiel stoor nie."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -313,43 +313,43 @@ msgstr "Direkte boodskappe aan %s"
msgid "All the direct messages sent to %s"
msgstr "Alle direkte boodskappe gestuur aan %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Die boodskap bevat geen inhoud nie!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Die ontvanger kon gevind word nie."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur "
"nie."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Geen status met die ID gevind nie."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Hierdie status is reeds 'n gunsteling."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Hierdie status is nie 'n gunsteling nie."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
@@ -385,122 +385,122 @@ msgstr ""
msgid "Could not find target user."
msgstr ""
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
"spasies bevat nie."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Nie 'n geldige gebruikersnaam nie."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Tuisblad is nie 'n geldige URL nie."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Volledige naam is te lang (maksimum 255 karakters)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Ligging is te lank is (maksimum 255 karakters)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Te veel aliasse! Die maksimum aantal is %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ongeldige alias: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Groep nie gevind nie!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "U is reeds 'n lid van die groep."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr ""
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr ""
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr ""
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s se groepe"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Groepe op %1$s waar %2$s lid van is."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s groepe"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "groepe op %s"
@@ -515,15 +515,15 @@ msgstr "Ongeldige token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -584,12 +584,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -597,8 +597,8 @@ msgid "Nickname"
msgstr "Bynaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Wagwoord"
@@ -614,11 +614,11 @@ msgstr "Toestaan"
msgid "Allow or deny access to your account information."
msgstr "Laat toegang tot u gebruikersinligting toe of weier dit."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Hierdie metode vereis 'n POST of DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
@@ -635,25 +635,25 @@ msgstr "U kan nie u eie kennisgewings herhaal nie."
msgid "Already repeated that notice."
msgstr "U het reeds die kennisgewing herhaal."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Die status is verwyder."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Geen status met die ID gevind nie."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nie gevind nie."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -662,32 +662,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Nie-ondersteunde formaat."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Gunstelinge van %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -702,12 +702,12 @@ msgstr "Na %s herhaal"
msgid "Repeats of %s"
msgstr "Herhalings van %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -764,7 +764,7 @@ msgid "Preview"
msgstr "Voorskou"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Skrap"
@@ -804,11 +804,11 @@ msgstr "Die avatar is verwyder."
msgid "You already blocked that user."
msgstr "U het reeds die gebruiker geblokkeer."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokkeer gebruiker"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -820,7 +820,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -830,7 +830,7 @@ msgstr "Nee"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Moenie hierdie gebruiker blokkeer nie"
@@ -839,7 +839,7 @@ msgstr "Moenie hierdie gebruiker blokkeer nie"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -848,11 +848,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkeer hierdie gebruiker"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -979,7 +979,7 @@ msgstr "U is nie die eienaar van hierdie applikasie nie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1010,7 +1010,7 @@ msgstr "Skrap hierdie applikasie"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nie aangeteken nie."
@@ -1039,7 +1039,7 @@ msgid "Do not delete this notice"
msgstr "Moenie hierdie kennisgewing verwyder nie"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Verwyder hierdie kennisgewing"
@@ -1077,45 +1077,54 @@ msgstr "Ontwerp"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Die logo-URL is ongeldig."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Tema is nie beskikbaar nie: %s"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Verander logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Webwerf-logo"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Verander tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Werf se tema"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema vir die werf."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Werf se tema"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Verander die agtergrond-prent"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Agtergrond"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1123,57 +1132,65 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Af"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Verander kleure"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Kantstrook"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Skakels"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Gebruik verstekwaardes"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Stel terug na standaard"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1183,7 +1200,7 @@ msgstr "Stel terug na standaard"
msgid "Save"
msgstr "Stoor"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Stoor ontwerp"
@@ -1457,7 +1474,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Nie 'n geldige e-posadres nie."
@@ -1680,13 +1697,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Geen profiel verskaf nie."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Daar is geen profiel met daardie ID nie."
@@ -1820,7 +1837,7 @@ msgstr "Maak hierdie gebruiker 'n administrateur"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s tydlyn"
@@ -2197,49 +2214,53 @@ msgstr "U is nie 'n lid van daardie groep nie."
msgid "%1$s left group %2$s"
msgstr "%1$s het die groep %2$s verlaat"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U is reeds aangeteken."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Verkeerde gebruikersnaam of wagwoord."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanteken"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Teken aan"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Onthou my"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Wagwoord verloor of vergeet?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Verkeerde gebruikersnaam of wagwoord."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2432,31 +2453,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Hierdie gebruiker het nie 'n profiel nie."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr ""
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2559,7 +2580,7 @@ msgid "6 or more characters"
msgstr "6 of meer karakters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bevestig"
@@ -2571,11 +2592,11 @@ msgstr "Dieselfde as wagwoord hierbo"
msgid "Change"
msgstr "Wysig"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Wagwoord moet 6 of meer karakters bevat."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Wagwoorde is nie dieselfde nie."
@@ -2596,7 +2617,7 @@ msgid "Password saved."
msgstr "Wagwoord gestoor."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Paaie"
@@ -2796,43 +2817,43 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Tuisblad"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ligging"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2872,7 +2893,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3116,7 +3137,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3124,78 +3145,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Die registrasie is voltooi"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreer"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrasie nie toegelaat nie."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Die E-posadres bestaan reeds."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wagwoord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-pos"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3214,7 +3257,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3289,7 +3332,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Herhalend"
@@ -3357,7 +3400,7 @@ msgstr ""
msgid "User doesn't have this role."
msgstr ""
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3371,7 +3414,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessies"
@@ -3414,7 +3457,7 @@ msgid "Icon"
msgstr "Ikoon"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Naam"
@@ -3425,7 +3468,7 @@ msgid "Organization"
msgstr "Organisasie"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Beskrywing"
@@ -4009,7 +4052,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4344,7 +4387,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Lisensie"
@@ -4465,29 +4508,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Opdaterings van %1$s op %2$s."
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Medewerkers"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4495,7 +4538,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4503,39 +4546,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Weergawe"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Outeur(s)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4574,45 +4617,45 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4713,188 +4756,188 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlik"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Konnekteer"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodig"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Teken uit"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skep 'n gebruiker"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registreer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Meld by die webwerf aan"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Teken in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help my!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Soek na mense of teks"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Soek"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Aangaande"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Gewilde vrae"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "Gebruiksvoorwaardes"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privaatheid"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Bron"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontak"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4902,13 +4945,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4917,54 +4960,54 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Voor"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -4972,11 +5015,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5007,64 +5050,64 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Webtuiste"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Ontwerp"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Gebruiker"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr ""
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5197,11 +5240,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr "Etikette vir hierdie aanhangsel"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Wagwoord wysiging het misluk"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Wagwoord verandering word nie toegelaat nie"
@@ -5292,14 +5335,14 @@ msgstr "Volle naam: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Ligging: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Tuisblad: %s"
@@ -5777,8 +5820,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5794,19 +5844,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Beskrywing: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5820,30 +5870,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5860,13 +5910,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuwe privaat boodskap vanaf %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5886,13 +5936,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5914,7 +5964,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5922,13 +5972,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5965,7 +6015,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "van"
@@ -6119,23 +6169,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "op"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in konteks"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Herhaal deur"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Antwoord"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr ""
@@ -6208,7 +6258,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Onbekend"
@@ -6245,7 +6295,7 @@ msgstr "Daaglikse gemiddelde"
msgid "All groups"
msgstr "Alle groepe"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6269,7 +6319,7 @@ msgstr "Uitgelig"
msgid "Popular"
msgstr "Gewild"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6290,7 +6340,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6388,6 +6438,50 @@ msgstr ""
msgid "None"
msgstr "Geen"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Die opdatering van die avatar het gefaal."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Kon nie die profiel stoor nie."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Mees aktiewe gebruikers"
@@ -6468,56 +6562,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index f6bf14d12..3f9f58275 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:04+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:02:42+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Ù†Ùاذ"
@@ -51,7 +51,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
@@ -85,25 +85,24 @@ msgid "Save"
msgstr "احÙظ"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "لا صÙحة كهذه"
+msgstr "لا صÙحة كهذه."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -116,7 +115,7 @@ msgid "No such user."
msgstr "لا مستخدم كهذا."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s والأصدقاء, الصÙحة %2$d"
@@ -124,39 +123,39 @@ msgstr "%1$s والأصدقاء, الصÙحة %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s والأصدقاء"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -164,14 +163,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,64 +178,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "أنت والأصدقاء"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "لم يتم العثور على وسيلة API."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقة POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "تعذّر تحديث المستخدم."
@@ -256,7 +255,7 @@ msgstr "لم يمكن Ø­Ùظ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -313,41 +312,41 @@ msgstr "رسالة مباشرة %s"
msgid "All the direct messages sent to %s"
msgstr "كل الرسائل المباشرة التي أرسلت إلى %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "لا نص ÙÙŠ الرسالة!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "لم ÙŠÙعثر على المستخدم المستلم."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "هذه الحالة Ù…Ùضلة بالÙعل."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "تعذّر إنشاء Ù…Ùضلة."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "تلك الحالة ليست Ù…Ùضلة."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "تعذّر حذ٠المÙضلة."
@@ -380,120 +379,119 @@ msgstr "تعذّر تحديد المستخدم المصدر."
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدÙ."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "الاسم المستعار مستخدم بالÙعل. جرّب اسمًا آخرًا."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "الصÙحة الرئيسية ليست عنونًا صالحًا."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرÙًا)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr ""
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "كنيات كيرة! العدد الأقصى هو %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "كنية غير صالحة: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "لم توجد المجموعة!"
+msgstr "المجموعة غير موجودة."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "لست عضوًا ÙÙŠ هذه المجموعة"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "مجموعات %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "المجموعات التي %s عضو Ùيها"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "مجموعات %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "مجموعات %s"
@@ -509,15 +507,15 @@ msgstr "حجم غير صالح."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -580,12 +578,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -593,8 +591,8 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "كلمة السر"
@@ -610,11 +608,11 @@ msgstr "اسمح"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -631,25 +629,25 @@ msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
msgid "Already repeated that notice."
msgstr "كرر بالÙعل هذه الملاحظة."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Ø­ÙØ°ÙÙت الحالة."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "لا حالة ÙˆÙجدت بهذه الهوية."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "لم يوجد."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -658,32 +656,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "نسق غير مدعوم."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمني العام"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -698,12 +696,12 @@ msgstr "كرر إلى %s"
msgid "Repeats of %s"
msgstr "تكرارات %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "الإشعارات الموسومة ب%s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -760,7 +758,7 @@ msgid "Preview"
msgstr "معاينة"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "احذÙ"
@@ -800,11 +798,11 @@ msgstr "Ø­Ùذ٠الأÙتار."
msgid "You already blocked that user."
msgstr "لقد منعت مسبقا هذا المستخدم."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "امنع المستخدم"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -816,17 +814,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "لا"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -835,20 +832,19 @@ msgstr "لا تمنع هذا المستخدم"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "نعم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ùشل Ø­Ùظ معلومات المنع."
@@ -894,9 +890,9 @@ msgstr "ألغ٠منع هذا المستخدم"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "مجموعات %s"
+msgstr "أرسل إلى %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -975,7 +971,7 @@ msgstr "أنت لست مالك هذا التطبيق."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1006,7 +1002,7 @@ msgstr "احذ٠هذا التطبيق"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "لست والجًا."
@@ -1035,7 +1031,7 @@ msgid "Do not delete this notice"
msgstr "لا تحذ٠هذا الإشعار"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "احذ٠هذا الإشعار"
@@ -1073,45 +1069,54 @@ msgstr "التصميم"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
msgstr "السمة غير متوÙرة: %s"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "سمة الموقع"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "سمة الموقع."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "سمة الموقع"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغيير صورة الخلÙية"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلÙية"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1119,57 +1124,65 @@ msgid ""
msgstr "بإمكانك رÙع صورة خلÙية للموقع. أقصى حجم للمل٠هو %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صورة الخلÙية أو عطّلها."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغيير الألوان"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1179,7 +1192,7 @@ msgstr "ارجع إلى المبدئي"
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "احÙظ التصميم"
@@ -1231,7 +1244,7 @@ msgstr "الوص٠مطلوب."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "المسار المصدر طويل جدًا."
#: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Source URL is not valid."
@@ -1332,7 +1345,6 @@ msgstr "عنوان البريد الإلكتروني المÙؤكد الحالي
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "أزل"
@@ -1349,7 +1361,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "ألغÙ"
@@ -1364,7 +1375,6 @@ msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "أضÙ"
@@ -1390,16 +1400,14 @@ msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ أل
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "جديد"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "التÙضيلات"
+msgstr "تÙضيلات البريد الإلكتروني"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1438,9 +1446,8 @@ msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروÙ
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Ø­ÙÙظت تÙضيلات التصميم."
+msgstr "Ø­ÙÙظت تÙضيلات البريد الإلكرتوني."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1453,7 +1460,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1493,15 +1500,13 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "هذا عنوان محادثة Ùورية خاطئ."
+msgstr "هذا عنوان بريد إلكتروني خطأ."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Ø£Ùلغي التأكيد."
+msgstr "Ø£Ùلغي تأكيد البريد الإلكتروني."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1511,9 +1516,8 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "أزيل هذا العنوان."
+msgstr "أزيل عنوان البريد الإلكتروني."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1679,13 +1683,13 @@ msgstr "المستخدم مسكت من قبل."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "لا مل٠شخصي Ù…Ùحدّد."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "لا مل٠شخصي بهذه الهوية."
@@ -1809,7 +1813,7 @@ msgstr "اجعل المستخدم إداريًا ÙÙŠ المجموعة"
#: actions/groupmembers.php:519
msgid "Make Admin"
-msgstr ""
+msgstr "اجعله إداريًا"
#: actions/groupmembers.php:519
msgid "Make this user an admin"
@@ -1819,7 +1823,7 @@ msgstr "اجعل هذا المستخدم إداريًا"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "مسار %s الزمني"
@@ -1930,7 +1934,7 @@ msgstr "عنوان المراسلة الÙورية"
#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
#. TRANS: Form note in IM settings form.
#. TRANS: %s is the IM address set for the site.
@@ -1952,9 +1956,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "التÙضيلات"
+msgstr "تÙضيلات المحادثة الÙورية"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2022,15 +2025,13 @@ msgstr "هذا عنوان محادثة Ùورية خاطئ."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "تعذّر حذ٠تأكيد البريد الإلكتروني."
+msgstr "تعذّر حذ٠تأكيد البريد المراسلة الÙورية."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Ø£Ùلغي التأكيد."
+msgstr "Ø£Ùلغي تأكيد المراسلة الÙورية."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2040,9 +2041,8 @@ msgstr "هذه ليست هويتك ÙÙŠ جابر."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "أزيل هذا العنوان."
+msgstr "أزيل عنوان المراسلة الÙورية هذا."
#: actions/inbox.php:59
#, php-format
@@ -2060,7 +2060,7 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "تم تعطيل الدعوات."
#: actions/invite.php:41
#, fuzzy, php-format
@@ -2202,50 +2202,54 @@ msgstr "لست عضوا ÙÙŠ تلك المجموعة."
msgid "%1$s left group %2$s"
msgstr "%1$s ترك المجموعة %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالÙعل."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست Ù…Ùصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ù„Ùج"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ù„Ùج إلى الموقع"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Ù„Ùج تلقائيًا ÙÙŠ المستقبل؛ هذا الخيار ليس Ù…Ùعدًا للحواسيب المشتركة!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمة السر؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"لأسباب أمنية، من Ùضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Ù„Ùج باسم مستخدم وكلمة سر"
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2268,9 +2272,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "لا حالة حالية"
+msgstr "لا حالة جارية."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2440,31 +2443,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "ليس للمستخدم مل٠شخصي."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "حالة %1$s ÙÙŠ يوم %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "نوع المحتوى "
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -2567,7 +2570,7 @@ msgid "6 or more characters"
msgstr "6 أحر٠أو أكثر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -2579,11 +2582,11 @@ msgstr "Ù†Ùس كلمة السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمة السر 6 حرو٠أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -2604,7 +2607,7 @@ msgid "Password saved."
msgstr "Ø­ÙÙظت كلمة السر."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "المسارات"
@@ -2613,24 +2616,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr ""
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "لا يمكن قراءة دليل السمات: %s"
+msgstr "لا يمكن قراءة دليل السمات: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "لا يمكن الكتابة ÙÙŠ دليل الأÙتارات: %s"
+msgstr "لا يمكن الكتابة ÙÙŠ دليل الأÙتارات: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "لا يمكن الكتابة ÙÙŠ دليل الخلÙيات: %s"
+msgstr "لا يمكن الكتابة ÙÙŠ دليل الخلÙيات: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "لا يمكن قراءة دليل المحليات: %s"
+msgstr "لا يمكن قراءة دليل المحليات: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2770,9 +2773,9 @@ msgid "People search"
msgstr "بحث ÙÙŠ الأشخاص"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "ليس وسم أشخاص صالح: %s"
+msgstr "ليس وسم أشخاص صالح: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2780,9 +2783,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "المستخدمون الذين وسموا أنÙسهم ب%1$s - الصÙحة %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "محتوى إشعار غير صالح"
+msgstr "محتوى إشعار غير صالح."
#: actions/postnotice.php:101
#, php-format
@@ -2806,43 +2808,43 @@ msgstr "معلومات المل٠الشخصي"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 حرÙًا إنجليزيًا أو رقمًا بدون نقاط أو مساÙات"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصÙحة الرئيسية"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "مسار صÙحتك الرئيسية أو مدونتك أو ملÙÙƒ الشخصي على موقع آخر"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "تكلم عن Ù†Ùسك واهتمامتك ÙÙŠ %d حرÙ"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "صÙÙ Ù†Ùسك واهتماماتك"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "السيرة"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
@@ -2883,7 +2885,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "اشترك تلقائيًا بأي شخص يشترك بي (ÙŠÙضل أن يستخدم لغير البشر)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -2923,9 +2925,9 @@ msgid "Settings saved."
msgstr "Ø­ÙÙظت الإعدادات."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "وراء حد الصÙحة (%s)"
+msgstr "بعد حد الصÙحة (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3133,7 +3135,7 @@ msgstr "يجب أن تكون كلمة السر 6 محار٠أو أكثر."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -3141,78 +3143,100 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "عذرا، رمز دعوة غير صالح."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "لا ÙŠÙسمح بالتسجيل."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "اسم مستخدم أو كلمة سر غير صالحة."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 حرو٠أو أكثر. مطلوب."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Ù†Ùس كلمة السر أعلاه. مطلوب."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3231,7 +3255,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3306,7 +3330,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
msgid "You already repeated that notice."
msgstr "أنت كررت هذه الملاحظة بالÙعل."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "مكرر"
@@ -3321,9 +3345,9 @@ msgid "Replies to %s"
msgstr "الردود على %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "الردود على %s"
+msgstr "الردود على %1$sØŒ الصÙحة %2$d"
#: actions/replies.php:145
#, php-format
@@ -3376,7 +3400,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق
msgid "User doesn't have this role."
msgstr "المستخدم بدون مل٠مطابق."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "ستاتس نت"
@@ -3390,14 +3414,13 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "الجلسات"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "الإعدادات الأساسية لموقع StatusNet هذا."
+msgstr "إعدادات جلسة موقع StatusNet هذا."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3434,7 +3457,7 @@ msgid "Icon"
msgstr "أيقونة"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "الاسم"
@@ -3445,7 +3468,7 @@ msgid "Organization"
msgstr "المنظمة"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "الوصÙ"
@@ -3470,7 +3493,7 @@ msgstr ""
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "معلومات التطبيق"
#: actions/showapplication.php:263
msgid "Consumer key"
@@ -3499,14 +3522,13 @@ msgid ""
msgstr ""
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "أمتأكد من أنك تريد حذ٠هذا الإشعار؟"
+msgstr "أمتأكد من أنك تريد إعادة ضبط Ù…Ùتاح المستهلك وكلمة سره؟"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "إشعارات %s المÙÙضلة"
+msgstr "إشعارات %1$s المÙÙضلة، الصÙحة %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3788,9 +3810,8 @@ msgid "Unknown language \"%s\"."
msgstr "لغة غير معروÙØ© \"%s\"."
#: actions/siteadminpanel.php:165
-#, fuzzy
msgid "Minimum text limit is 0 (unlimited)."
-msgstr "حد النص الأدنى هو 140 حرÙًا."
+msgstr "حد النص الأدنى 0 (غير محدود)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3915,9 +3936,8 @@ msgstr "الرسائل القصيرة غير متوÙرة."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "عنوان المراسلة الÙورية"
+msgstr "عنوان الرسائل القصيرة"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -3941,7 +3961,6 @@ msgstr ""
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "أكّد"
@@ -3954,13 +3973,12 @@ msgstr "رقم هات٠SMS"
#. TRANS: SMS phone number input field instructions in SMS settings form.
#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "رقم الهات٠بدون شرطات أو مساÙات مع رمز المنطقة"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "التÙضيلات"
+msgstr "تÙضيلات الرسائل القصيرة"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -3971,9 +3989,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Ø­ÙÙÙظت التÙضيلات."
+msgstr "Ø­ÙÙظت تÙضيلات الرسائل القصيرة."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4009,9 +4026,8 @@ msgstr "إن رقم التأكيد هذا خاطئ."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Ø£Ùلغي التأكيد."
+msgstr "Ø£Ùلغي تأكيد الرسائل القصيرة."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4021,9 +4037,8 @@ msgstr "هذا ليس رقم هاتÙÙƒ."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "رقم هات٠SMS"
+msgstr "تمت إزالة رقم هات٠الرسائل القصيرة."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4051,7 +4066,7 @@ msgstr "لم تدخل رمزًا"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4388,7 +4403,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "الرخصة"
@@ -4509,18 +4524,18 @@ msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) وال
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "ستاتس نت %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4529,11 +4544,11 @@ msgstr ""
"هذا الموقع يشغله %1$s النسخة %2$s، حقوق النشر 2008-2010 StatusNet, Inc "
"ومساهموها."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "المساهمون"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4541,7 +4556,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4549,39 +4564,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "الملحقات"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "النسخة"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "المؤلÙ(ون)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4620,46 +4635,46 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "مشكلة ÙÙŠ Ø­Ùظ الإشعار. طويل جدًا."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "مشكلة ÙÙŠ Ø­Ùظ الإشعار. مستخدم غير معروÙ."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "مشكلة أثناء Ø­Ùظ الإشعار."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -4763,189 +4778,189 @@ msgid "Untitled page"
msgstr "صÙحة غير Ù…Ùعنونة"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "المل٠الشخصي ومسار الأصدقاء الزمني"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "الصÙحة الشخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير بريدك الإلكتروني وكلمة سرّك وأÙتارك وملÙÙƒ الشخصي"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "اتصالات"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ادع٠أصدقائك وزملائك للانضمام إليك ÙÙŠ %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "ادعÙ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "اخرج من الموقع"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "اخرج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ حسابًا"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ù„Ùج إلى الموقع"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Ù„Ùج"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نصوص"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "ابحث"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "إشعار الموقع"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "المشاهدات المحلية"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "إشعار الصÙحة"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "مساعدة"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "عن"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "الأسئلة المكررة"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "الشروط"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "خصوصية"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "المصدر"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "الجسر"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "رخصة برنامج StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4955,13 +4970,13 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4973,54 +4988,54 @@ msgstr ""
"agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "قبل"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5028,11 +5043,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5063,65 +5078,65 @@ msgid "Unable to delete design setting."
msgstr "تعذّر حذ٠إعدادات التصميم."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "الموقع"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "ضبط التصميم"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "التصميم"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "ضبط المستخدم"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "المستخدم"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "ضبط الحساب"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "ضبط المسارات"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "ضبط الجلسات"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "عدّل إشعار الموقع"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "ضبط المسارات"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5252,11 +5267,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr "وسوم هذا المرÙÙ‚"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "تغيير كلمة السر Ùشل"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "تغيير كلمة السر غير مسموح به"
@@ -5350,14 +5365,14 @@ msgstr "الاسم الكامل: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "الصÙحة الرئيسية: %s"
@@ -5895,8 +5910,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5922,19 +5944,19 @@ msgstr ""
"غيّر خيارات البريد الإلكتروني والإشعار ÙÙŠ %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "السيرة: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5948,30 +5970,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "حالة %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "تأكيد الرسالة القصيرة"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "لقد نبهك %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5988,13 +6010,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "رسالة خاصة جديدة من %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6014,13 +6036,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "لقد أضا٠%s (@%s) إشعارك إلى Ù…Ùضلاته"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6042,7 +6064,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6050,13 +6072,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6093,7 +6115,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "من"
@@ -6247,23 +6269,23 @@ msgstr ""
msgid "at"
msgstr "ÙÙŠ"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "ÙÙŠ السياق"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "مكرر بواسطة"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "رÙد على هذا الإشعار"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "رÙد"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -6336,7 +6358,7 @@ msgstr "رسائلك المÙرسلة"
msgid "Tags in %s's notices"
msgstr "وسوم ÙÙŠ إشعارات %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "غير معروÙØ©"
@@ -6373,7 +6395,7 @@ msgstr "المÙعدّل اليومي"
msgid "All groups"
msgstr "كل المجموعات"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6397,7 +6419,7 @@ msgstr "Ù…Ùختارون"
msgid "Popular"
msgstr "محبوبة"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
@@ -6418,7 +6440,7 @@ msgstr "كرّر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6516,6 +6538,50 @@ msgstr ""
msgid "None"
msgstr "لا شيء"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Ùشل تحديث الأÙتار."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "خطأ أثناء تحديث المل٠الشخصي البعيد"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "أعلى المرسلين"
@@ -6597,56 +6663,56 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 3b6d78a7b..8fc629453 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:07+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:02:48+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -24,7 +24,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Ù†Ùاذ"
@@ -91,25 +91,25 @@ msgid "Save"
msgstr "أرسل"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "لا صÙحه كهذه"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -122,7 +122,7 @@ msgid "No such user."
msgstr "لا مستخدم كهذا."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s Ùˆ الصحاب, صÙحه %2$d"
@@ -130,39 +130,39 @@ msgstr "%1$s Ùˆ الصحاب, صÙحه %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s والأصدقاء"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -170,14 +170,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,64 +185,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "أنت والأصدقاء"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "الـ API method مش موجوده."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقه POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "تعذّر تحديث المستخدم."
@@ -262,7 +262,7 @@ msgstr "لم يمكن Ø­Ùظ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -319,41 +319,41 @@ msgstr "رساله مباشره %s"
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "لا نص ÙÙ‰ الرسالة!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "لم ÙŠÙعثر على المستخدم المستلم."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "الحاله دى موجوده Ùعلا ÙÙ‰ التÙضيلات."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "تعذّر إنشاء Ù…Ùضله."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "الحاله دى مش محطوطه ÙÙ‰ التÙضيلات."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "تعذّر حذ٠المÙضله."
@@ -386,120 +386,120 @@ msgstr ""
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدÙ."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "الصÙحه الرئيسيه ليست عنونًا صالحًا."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرÙًا)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr ""
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "كنيه غير صالحة: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "لم توجد المجموعة!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ما Ù†Ùعش يضم %1$s للجروپ %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr ""
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "ما Ù†Ùعش يتشال اليوزر %1$s من الجروپ %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "مجموعات %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "المجموعات التى %s عضو Ùيها"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "مجموعات %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "مجموعات %s"
@@ -515,15 +515,15 @@ msgstr "حجم غير صالح."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -586,12 +586,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -599,8 +599,8 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "كلمه السر"
@@ -616,11 +616,11 @@ msgstr "اسمح"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -637,25 +637,25 @@ msgstr "مش ناÙعه تتكرر الملاحظتك بتاعتك."
msgid "Already repeated that notice."
msgstr "الملاحظه اتكررت Ùعلا."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Ø­ÙØ°ÙÙت الحاله."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "لم يوجد."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -664,32 +664,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "نسق غير مدعوم."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمنى العام"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -704,12 +704,12 @@ msgstr "كرر إلى %s"
msgid "Repeats of %s"
msgstr "تكرارات %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "الإشعارات الموسومه ب%s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -766,7 +766,7 @@ msgid "Preview"
msgstr "عاين"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "احذÙ"
@@ -807,11 +807,11 @@ msgstr "Ø­Ùذ٠الأÙتار."
msgid "You already blocked that user."
msgstr "لقد منعت مسبقا هذا المستخدم."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "امنع المستخدم"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -823,7 +823,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -833,7 +833,7 @@ msgstr "لا"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -842,7 +842,7 @@ msgstr "لا تمنع هذا المستخدم"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -851,11 +851,11 @@ msgid "Yes"
msgstr "نعم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ùشل Ø­Ùظ معلومات المنع."
@@ -984,7 +984,7 @@ msgstr "انت مش بتملك الapplication دى."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1018,7 +1018,7 @@ msgstr "احذ٠هذا الإشعار"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "لست والجًا."
@@ -1047,7 +1047,7 @@ msgid "Do not delete this notice"
msgstr "لا تحذ٠هذا الإشعار"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "احذ٠هذا الإشعار"
@@ -1085,45 +1085,54 @@ msgstr "التصميم"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "السمه غير متوÙرة: %s"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "سمه الموقع"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "سمه الموقع."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "سمه الموقع"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغيير صوره الخلÙية"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلÙية"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1131,57 +1140,65 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صوره الخلÙيه أو عطّلها."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغيير الألوان"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1191,7 +1208,7 @@ msgstr "ارجع إلى المبدئي"
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "احÙظ التصميم"
@@ -1466,7 +1483,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1692,13 +1709,13 @@ msgstr "المستخدم مسكت من قبل."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "لا مل٠شخصى Ù…Ùحدّد."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "لا مل٠شخصى بهذه الهويه."
@@ -1832,7 +1849,7 @@ msgstr "اجعل هذا المستخدم إداريًا"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "مسار %s الزمني"
@@ -2210,49 +2227,53 @@ msgstr "لست عضوا ÙÙ‰ تلك المجموعه."
msgid "%1$s left group %2$s"
msgstr "%1$s ساب جروپ %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالÙعل."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست Ù…Ùصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ù„Ùج"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ù„Ùج إلى الموقع"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمه السر؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2446,31 +2467,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "ليس للمستخدم مل٠شخصى."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "نوع المحتوى "
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr " مش نظام بيانات مدعوم."
@@ -2573,7 +2594,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -2585,11 +2606,11 @@ msgstr "Ù†Ùس كلمه السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمه السر 6 حرو٠أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -2610,7 +2631,7 @@ msgid "Password saved."
msgstr "Ø­ÙÙظت كلمه السر."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "المسارات"
@@ -2810,43 +2831,43 @@ msgstr "معلومات المل٠الشخصي"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصÙحه الرئيسية"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "صÙÙ Ù†Ùسك واهتماماتك"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "السيرة"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2886,7 +2907,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3136,7 +3157,7 @@ msgstr "يجب أن تكون كلمه السر 6 محار٠أو أكثر."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -3144,78 +3165,100 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "عذرا، رمز دعوه غير صالح."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "لا ÙŠÙسمح بالتسجيل."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "اسم مستخدم أو كلمه سر غير صالحه."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 حرو٠أو أكثر. مطلوب."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Ù†Ùس كلمه السر أعلاه. مطلوب."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3234,7 +3277,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3309,7 +3352,7 @@ msgstr "ما ينÙعش تكرر الملاحظه بتاعتك."
msgid "You already repeated that notice."
msgstr "انت عيدت الملاحظه دى Ùعلا."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "مكرر"
@@ -3379,7 +3422,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق
msgid "User doesn't have this role."
msgstr "يوزر من-غير پروÙايل زيّه."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3393,7 +3436,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "الجلسات"
@@ -3437,7 +3480,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "الاسم"
@@ -3448,7 +3491,7 @@ msgid "Organization"
msgstr "المنظمه"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "الوصÙ"
@@ -4045,7 +4088,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4384,7 +4427,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "الرخصة"
@@ -4505,29 +4548,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4535,7 +4578,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4543,39 +4586,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "النسخه"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "المؤلÙ/ين"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4615,46 +4658,46 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "مشكله ÙÙ‰ Ø­Ùظ الإشعار. طويل جدًا."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "مشكله ÙÙ‰ Ø­Ùظ الإشعار. مستخدم غير معروÙ."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "مشكله أثناء Ø­Ùظ الإشعار."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -4758,133 +4801,133 @@ msgid "Untitled page"
msgstr "صÙحه غير Ù…Ùعنونة"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "المل٠الشخصى ومسار الأصدقاء الزمني"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "شخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير كلمه سرّك"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "كونيكشونات (Connections)"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "ادعÙ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "اخرج من الموقع"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "اخرج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ حسابًا"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ù„Ùج إلى الموقع"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Ù„Ùج"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4892,71 +4935,71 @@ msgstr "ابحث"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "إشعار الموقع"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "المشاهدات المحلية"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "إشعار الصÙحة"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "مساعدة"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "عن"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "الأسئله المكررة"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "الشروط"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "خصوصية"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "المصدر"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4966,13 +5009,13 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4984,54 +5027,54 @@ msgstr ""
"agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "قبل"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5039,11 +5082,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5074,71 +5117,71 @@ msgid "Unable to delete design setting."
msgstr "تعذّر حذ٠إعدادات التصميم."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "الموقع"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "ضبط التصميم"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "التصميم"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "ضبط المسارات"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "المستخدم"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "ضبط التصميم"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "ضبط المسارات"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "ضبط التصميم"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "إشعار الموقع"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "ضبط المسارات"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5269,11 +5312,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr "وسوم هذا المرÙÙ‚"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "تغيير الپاسوورد Ùشل"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "تغيير الپاسوورد مش مسموح"
@@ -5367,14 +5410,14 @@ msgstr "الاسم الكامل: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "الصÙحه الرئيسية: %s"
@@ -5862,8 +5905,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5879,19 +5929,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "عن Ù†Ùسك: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5905,30 +5955,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "حاله %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5945,13 +5995,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "رساله خاصه جديده من %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5971,13 +6021,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5999,7 +6049,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6007,13 +6057,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6050,7 +6100,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "من"
@@ -6205,23 +6255,23 @@ msgstr ""
msgid "at"
msgstr "ÙÙŠ"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "ÙÙ‰ السياق"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "متكرر من"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "رÙد على هذا الإشعار"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "رÙد"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -6294,7 +6344,7 @@ msgstr "رسائلك المÙرسلة"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "مش معروÙ"
@@ -6331,7 +6381,7 @@ msgstr ""
msgid "All groups"
msgstr "كل المجموعات"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6355,7 +6405,7 @@ msgstr "Ù…Ùختارون"
msgid "Popular"
msgstr "مشهورة"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
@@ -6376,7 +6426,7 @@ msgstr "كرر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6474,6 +6524,50 @@ msgstr ""
msgid "None"
msgstr "لا شيء"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Ùشل تحديث الأÙتار."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "خطأ أثناء تحديث المل٠الشخصى البعيد"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "أعلى المرسلين"
@@ -6556,56 +6650,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index e38fe609c..6f87d49be 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:11+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:02:52+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "ДоÑтъп"
@@ -85,25 +85,25 @@ msgid "Save"
msgstr "Запазване"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "ÐÑма такака Ñтраница."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -116,7 +116,7 @@ msgid "No such user."
msgstr "ÐÑма такъв потребител"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s и приÑтели, Ñтраница %2$d"
@@ -124,39 +124,39 @@ msgstr "%1$s и приÑтели, Ñтраница %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s и приÑтели"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "ЕмиÑÐ¸Ñ Ñ Ð¿Ñ€Ð¸Ñтелите на %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "ЕмиÑÐ¸Ñ Ñ Ð¿Ñ€Ð¸Ñтелите на %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "ЕмиÑÐ¸Ñ Ñ Ð¿Ñ€Ð¸Ñтелите на %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -164,14 +164,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,64 +179,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Вие и приÑтелите"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Бележки от %1$s и приÑтели в %2$s."
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Ðе е открит методът в API."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Този метод изиÑква заÑвка POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Грешка при обновÑване на потребителÑ."
@@ -256,7 +256,7 @@ msgstr "Грешка при запазване на профила."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -315,43 +315,43 @@ msgstr "Преки ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ %s"
msgid "All the direct messages sent to %s"
msgstr "Ð’Ñички преки ÑъобщениÑ, изпратени до %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "ЛипÑва текÑÑ‚ на Ñъобщението"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Твърде дълго. Може да е най-много %d знака."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "ПолучателÑÑ‚ не е открит"
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Ðе може да изпращате преки ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ хора, които не Ñа в ÑпиÑъка ви Ñ "
"приÑтели."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Тази бележка вече е отбелÑзана като любима."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Грешка при отбелÑзване като любима."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Тази бележка не е отбелÑзана като любима."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Грешка при изтриване на любима бележка."
@@ -385,122 +385,121 @@ msgstr "Грешка при изтеглÑне на Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾Ðº"
msgid "Could not find target user."
msgstr "ЦелевиÑÑ‚ потребител не беше открит."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"ПÑевдонимът може да Ñъдържа Ñамо малки букви, чиÑла и никакво разÑтоÑние "
"между Ñ‚ÑÑ…."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Опитайте друг пÑевдоним, този вече е зает."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ðеправилен пÑевдоним."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "ÐдреÑÑŠÑ‚ на личната Ñтраница не е правилен URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Пълното име е твърде дълго (макÑ. 255 знака)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ОпиÑанието е твърде дълго (до %d Ñимвола)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Името на меÑтоположението е твърде дълго (макÑ. 255 знака)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ðеправилен пÑевдоним: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "ПÑевдонимът \"%s\" вече е зает. Опитайте друг."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Групата не е открита."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Вече членувате в тази група."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Ðе членувате в тази група."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Групи на %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Групи, в които учаÑтва %s"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Групи на %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "групи в %s"
@@ -516,15 +515,15 @@ msgstr "Ðеправилен размер."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -587,12 +586,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -600,8 +599,8 @@ msgid "Nickname"
msgstr "ПÑевдоним"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Парола"
@@ -618,11 +617,11 @@ msgstr "Ð’Ñички"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Този метод изиÑква заÑвка POST или DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Ðе може да изтривате бележки на друг потребител."
@@ -639,25 +638,25 @@ msgstr "Ðе можете да повтарÑте ÑобÑтвени бележÐ
msgid "Already repeated that notice."
msgstr "Вече Ñте повторили тази бележка."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Бележката е изтрита."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе е открито."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -666,32 +665,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Ðеподдържан формат."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / ОтбелÑзани като любими от %s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s бележки отбелÑзани като любими от %s / %s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Реплики на %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s реплики на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Общ поток на %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -706,12 +705,12 @@ msgstr "Повторено за %s"
msgid "Repeats of %s"
msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð½Ð° %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
@@ -771,7 +770,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Изтриване"
@@ -811,11 +810,11 @@ msgstr "Ðватарът е изтрит."
msgid "You already blocked that user."
msgstr "Вече Ñте блокирали този потребител."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокиране на потребителÑ"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -827,17 +826,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Ðе"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Да не Ñе блокира този потребител"
@@ -846,20 +844,19 @@ msgstr "Да не Ñе блокира този потребител"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокиране на потребителÑ"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Грешка при запиÑване данните за блокирането."
@@ -973,31 +970,27 @@ msgid "Notices"
msgstr "Бележки"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "За да редактирате група, Ñ‚Ñ€Ñбва да Ñте влезли."
+msgstr "За да изтриете приложение, Ñ‚Ñ€Ñбва да Ñте влезли."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "Бележката нÑма профил"
+msgstr "Приложението не е открито."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
-#, fuzzy
msgid "You are not the owner of this application."
-msgstr "Ðе членувате в тази група."
+msgstr "Ðе Ñте ÑобÑтвеник на това приложение."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "ÐÑма такава бележка."
+msgstr "Изтриване на приложението"
#: actions/deleteapplication.php:149
msgid ""
@@ -1008,15 +1001,13 @@ msgstr ""
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "Да не Ñе изтрива бележката"
+msgstr "Да не Ñе изтрива приложението"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
-#, fuzzy
msgid "Delete this application"
-msgstr "Изтриване на бележката"
+msgstr "Изтриване на това приложение"
#. 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
@@ -1024,7 +1015,7 @@ msgstr "Изтриване на бележката"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ðе Ñте влезли в ÑиÑтемата."
@@ -1053,7 +1044,7 @@ msgid "Do not delete this notice"
msgstr "Да не Ñе изтрива бележката"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Изтриване на бележката"
@@ -1091,49 +1082,58 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ðеправилен размер."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Страницата не е доÑтъпна във вида медиÑ, който приемате"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "СмÑна на логото"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Лого на Ñайта"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "ПромÑна"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Ðова бележка"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
#, fuzzy
msgid "Theme for the site."
msgstr "Излизане от Ñайта"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Ðова бележка"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "СмÑна на изображението за фон"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1141,58 +1141,66 @@ msgid ""
msgstr "Може да качите лого за групата ви."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Изкл."
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "СмÑна на цветовете"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Съдържание"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Страничен панел"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "ТекÑÑ‚"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "СпиÑък"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1202,7 +1210,7 @@ msgstr ""
msgid "Save"
msgstr "Запазване"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1362,7 +1370,6 @@ msgstr "Текущ потвърден Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Премахване"
@@ -1396,7 +1403,6 @@ msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща, като \"UserName@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "ДобавÑне"
@@ -1486,7 +1492,7 @@ msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреÑа на е-пощата"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ðеправилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща."
@@ -1721,13 +1727,13 @@ msgstr "ПотребителÑÑ‚ вече е заглушен."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ðе е указан профил."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðе е открит профил Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
@@ -1869,7 +1875,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Поток на %s"
@@ -2292,40 +2298,40 @@ msgstr "Ðе членувате в тази група."
msgid "%1$s left group %2$s"
msgstr "%1$s напуÑна групата %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Вече Ñте влезли."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Вход в Ñайта"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Ðвтоматично влизане занапред. Да не Ñе ползва на общи компютри!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Загубена или забравена парола"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2333,11 +2339,15 @@ msgstr ""
"За по-голÑма ÑигурноÑÑ‚, Ð¼Ð¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ отново потребителÑкото Ñи име и парола "
"при промÑна на наÑтройките."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Вход Ñ Ð¸Ð¼Ðµ и парола"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Влезте Ñ Ð¸Ð¼Ðµ и парола. ÐÑмате такива? [РегиÑтрирайте](%%action.register%%) "
"нова Ñметка или опитайте Ñ [OpenID](%%action.openidlogin%%). "
@@ -2542,31 +2552,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Бележката нÑма профил"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Бележка на %1$s от %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "вид Ñъдържание "
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Ðеподдържан формат на данните"
@@ -2588,7 +2598,7 @@ msgstr "Управление на различни други наÑтройки
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr " (безплатна уÑлуга)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
@@ -2676,7 +2686,7 @@ msgid "6 or more characters"
msgstr "6 или повече знака"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Потвърждаване"
@@ -2688,11 +2698,11 @@ msgstr "Също като паролата по-горе"
msgid "Change"
msgstr "ПромÑна"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Паролата Ñ‚Ñ€Ñбва да е 6 или повече знака."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Паролите не Ñъвпадат."
@@ -2713,7 +2723,7 @@ msgid "Password saved."
msgstr "Паролата е запиÑана."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Пътища"
@@ -2915,43 +2925,43 @@ msgstr "Данни на профила"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "От 1 до 64 малки букви или цифри, без Ð¿ÑƒÐ½ÐºÑ‚Ð¾Ð°Ñ†Ð¸Ñ Ð¸ интервали"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Пълно име"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Лична Ñтраница"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° личната ви Ñтраница, блог или профил в друг Ñайт"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишете Ñебе Ñи и интереÑите Ñи в до %d букви"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишете Ñебе Ñи и интереÑите Ñи"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "За мен"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "МеÑтоположение"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Къде Ñе намирате (град, община, държава и Ñ‚.н.)"
@@ -2993,7 +3003,7 @@ msgstr ""
"Ðвтоматично абониране за вÑеки, който Ñе абонира за мен (подходÑщо за "
"ботове)."
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "БиографиÑта е твърде дълга (до %d Ñимвола)."
@@ -3241,7 +3251,7 @@ msgstr "Паролата Ñ‚Ñ€Ñбва да е от поне 6 знака."
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не Ñъвпадат."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Грешка в наÑтройките на потребителÑ."
@@ -3249,81 +3259,103 @@ msgstr "Грешка в наÑтройките на потребителÑ."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовата парола е запазена. ВлÑзохте уÑпешно."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Грешка в кода за потвърждение."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "ЗапиÑването е уÑпешно."
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑтриране"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "ЗапиÑването не е позволено."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Ðе можете да Ñе региÑтрате, ако не Ñте ÑъглаÑни Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð°."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "ÐдреÑÑŠÑ‚ на е-поща вече Ñе използва."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ðеправилно име или парола."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"От 1 до 64 малки букви или цифри, без Ð¿ÑƒÐ½ÐºÑ‚Ð¾Ð°Ñ†Ð¸Ñ Ð¸ интервали. Задължително "
"поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 или повече знака. Задължително поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Е-поща"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Използва Ñе Ñамо за промени, обÑви или възÑтановÑване на паролата"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "По-дълго име, за предпочитане \"иÑтинÑкото\" ви име."
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr " оÑвен тези лични данни: парола, е-поща, меÑинджър, телефон."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3356,7 +3388,7 @@ msgstr ""
"Благодарим, че Ñе включихте в Ñайта и дано ползването на уÑлугата ви ноÑи "
"Ñамо приÑтни мигове!"
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3439,7 +3471,7 @@ msgstr "Ðе можете да повтарÑте ÑобÑтвена бележÐ
msgid "You already repeated that notice."
msgstr "Вече Ñте повторили тази бележка."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Повторено"
@@ -3509,7 +3541,7 @@ msgstr "Ðе можете да заглушавате потребители нÐ
msgid "User doesn't have this role."
msgstr "Потребител без ÑъответÑтващ профил"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3525,7 +3557,7 @@ msgstr "ПотребителÑÑ‚ ви е блокирал."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "СеÑии"
@@ -3556,14 +3588,12 @@ msgid "Save site settings"
msgstr "Запазване наÑтройките на Ñайта"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "За напуÑнете група, Ñ‚Ñ€Ñбва да Ñте влезли."
+msgstr "За прегледате приложение, Ñ‚Ñ€Ñбва да Ñте влезли."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Бележката нÑма профил"
+msgstr "Профил на приложението"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -3571,7 +3601,7 @@ msgid "Icon"
msgstr "Икона"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Име"
@@ -3582,7 +3612,7 @@ msgid "Organization"
msgstr "ОрганизациÑ"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "ОпиÑание"
@@ -4186,7 +4216,7 @@ msgstr "Ðе е въведен код."
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4277,9 +4307,9 @@ msgid "%s subscribers"
msgstr "%s абоната"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "Ðбонаменти на %s, Ñтраница %d"
+msgstr "Ðбонати на %1$s, Ñтраница %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -4314,9 +4344,9 @@ msgid "%s subscriptions"
msgstr "Ðбонаменти на %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "Ðбонаменти на %s, Ñтраница %d"
+msgstr "Ðбонаменти на %1$s, Ñтраница %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -4537,7 +4567,7 @@ msgstr ""
"Проверете тези детайли и Ñе уверете, че иÑкате да Ñе абонирате за бележките "
"на този потребител. Ðко не иÑкате абонамента, натиÑнете \"Cancel\" (Отказ)."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Лиценз"
@@ -4666,29 +4696,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4696,7 +4726,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4704,39 +4734,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "ПриÑтавки"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "ВерÑиÑ"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4780,28 +4810,28 @@ msgid "Could not update message with new URI."
msgstr "Грешка при обновÑване на бележката Ñ Ð½Ð¾Ð² URL-адреÑ."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Проблем при запиÑване на бележката."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Грешка при запиÑване на бележката. Ðепознат потребител."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново Ñлед нÑколко минути."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4810,22 +4840,22 @@ msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново Ñлед нÑколко минути."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този Ñайт."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Проблем при запиÑване на бележката."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4934,201 +4964,195 @@ msgid "Untitled page"
msgstr "Ðеозаглавена Ñтраница"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "ПромÑна на поща, аватар, парола, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Свързване към уÑлуги"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Свързване"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
-#, fuzzy
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "ПромÑна наÑтройките на Ñайта"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "ÐаÑтройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
-#, fuzzy, php-format
+#: lib/action.php:465
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приÑтели и колеги да Ñе приÑъединÑÑ‚ към Ð²Ð°Ñ Ð² %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Излизане от Ñайта"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Изход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Създаване на нова Ñметка"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
-#, fuzzy
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтриране"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Влизане в Ñайта"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Помощ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
-#, fuzzy
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ТърÑене за хора или бележки"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "ТърÑене"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "Ðова бележка"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "Ðова бележка"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "Ðбонаменти"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Помощ"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "ОтноÑно"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "ВъпроÑи"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "УÑловиÑ"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "ПоверителноÑÑ‚"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Изходен код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Табелка"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5138,13 +5162,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** е уÑлуга за микроблогване."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5156,54 +5180,54 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Лиценз на Ñъдържанието"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Преди"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5211,11 +5235,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5250,70 +5274,70 @@ msgid "Unable to delete design setting."
msgstr "Грешка при запиÑване наÑтройките за Twitter"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "ОÑновна наÑтройка на Ñайта"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Сайт"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "ÐаÑтройка на оформлението"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "ВерÑиÑ"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "ÐаÑтройка на пътищата"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Потребител"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "ÐаÑтройка на оформлението"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "ÐаÑтройка на пътищата"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "ÐаÑтройка на оформлението"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Ðова бележка"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "ÐаÑтройка на пътищата"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5448,12 +5472,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Паролата е запиÑана."
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Паролата е запиÑана."
@@ -5549,14 +5573,14 @@ msgstr "Пълно име: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "МеÑтоположение: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Домашна Ñтраница: %s"
@@ -6043,8 +6067,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s вече получава бележките ви в %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6070,19 +6101,19 @@ msgstr ""
"Може да Ñмените адреÑа и наÑтройките за уведомÑване по е-поща на %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "БиографиÑ: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðов Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща за публикщуване в %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6096,30 +6127,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "СъÑтоÑние на %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Потвърждение за SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Очаква Ñе потвърждение за този телефонен номер."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Побутнати Ñте от %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6136,13 +6167,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ðово лично Ñъобщение от %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6162,13 +6193,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) отбелÑза бележката ви като любима"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6190,7 +6221,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6198,13 +6229,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6241,7 +6272,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "от"
@@ -6355,14 +6386,12 @@ msgid "Attach a file"
msgstr "ПрикрепÑне на файл"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Грешка при запазване етикетите."
+msgstr "СподелÑне на меÑтоположението ми"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Грешка при запазване етикетите."
+msgstr "Без ÑподелÑне на меÑтоположението ми"
#: lib/noticeform.php:216
msgid ""
@@ -6399,23 +6428,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "в контекÑÑ‚"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Повторено от"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ОтговарÑне на тази бележка"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Отговор"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Бележката е повторена."
@@ -6489,7 +6518,7 @@ msgstr "Изпратените от Ð²Ð°Ñ ÑъобщениÑ"
msgid "Tags in %s's notices"
msgstr "Етикети в бележките на %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "Ðепознато дейÑтвие"
@@ -6528,7 +6557,7 @@ msgstr ""
msgid "All groups"
msgstr "Ð’Ñички групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6552,14 +6581,13 @@ msgstr "Избрано"
msgid "Popular"
msgstr "ПопулÑрно"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "ЛипÑват аргументи return-to."
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "ПовтарÑне на тази бележка"
+msgstr "Да Ñе повтори ли тази бележка?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6574,7 +6602,7 @@ msgstr "ПовтарÑне на тази бележка"
msgid "Revoke the \"%s\" role from this user"
msgstr "СпиÑък Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ в тази група."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6602,9 +6630,8 @@ msgid "Search"
msgstr "ТърÑене"
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
-msgstr "ТърÑене"
+msgstr "Помощ за Ñ‚ÑŠÑ€Ñенето"
#: lib/searchgroupnav.php:80
msgid "People"
@@ -6676,6 +6703,51 @@ msgstr ""
msgid "None"
msgstr "Без"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "СиÑтемна грешка при качване на файл."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "ÐеуÑпешно обновÑване на аватара."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Грешка при обновÑване на отдалечен профил"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Ðай-чеÑто пишещи"
@@ -6758,56 +6830,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "преди нÑколко Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "преди около чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "преди около меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "преди около %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 3b72ee8c2..098967713 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:14+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:02:56+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Moned"
@@ -84,24 +84,24 @@ msgid "Save"
msgstr "Enrollañ"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "N'eus ket eus ar bajenn-se."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -114,7 +114,7 @@ msgid "No such user."
msgstr "N'eus ket eus an implijer-se."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s hag e vignoned, pajenn %2$d"
@@ -122,39 +122,39 @@ msgstr "%1$s hag e vignoned, pajenn %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s hag e vignoned"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Gwazh evit mignoned %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Gwazh evit mignoned %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Gwazh evit mignoned %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -162,14 +162,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -177,64 +177,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "C'hwi hag o mignoned"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "N'eo ket bet kavet an hentenn API !"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Ezhomm en deus an argerzh-mañ eus ur POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Diposubl eo hizivaat an implijer."
@@ -254,7 +254,7 @@ msgstr "Diposubl eo enrollañ ar profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -311,43 +311,43 @@ msgstr "Kemennadennoù war-eeun kaset da %s"
msgid "All the direct messages sent to %s"
msgstr "An holl gemennadennoù war-eeun kaset da %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Kemenadenn hep testenn !"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "N'eo ket bet kavet ar resever."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho "
"mignoned."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "N'eo bet kavet statud ebet gant an ID-mañ."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Ur pennroll eo dija an ali-mañ."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Diposupl eo krouiñ ar pennroll-mañ."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "N'eo ket ar statud-mañ ur pennroll."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Diposupl eo dilemel ar pennroll-mañ."
@@ -381,119 +381,119 @@ msgstr "Diposubl eo termeniñ an implijer mammenn."
msgid "Could not find target user."
msgstr "Diposubl eo kavout an implijer pal."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "N'eo ket ul lesanv mat."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Re a aliasoù ! %d d'ar muiañ."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias fall : \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "N'eo ket bet kavet ar strollad."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Un ezel eus ar strollad-mañ eo dija."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "N'oc'h ket ezel eus ar strollad-mañ."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Strollad %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#: actions/apigrouplist.php:108
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Ezel eo %s eus ar strolladoù"
+msgstr "Strolladoù %1s m'eo ezel %2s."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Strolladoù %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "strolladoù war %s"
@@ -508,15 +508,15 @@ msgstr "Fichenn direizh."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -577,12 +577,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Kont"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -590,8 +590,8 @@ msgid "Nickname"
msgstr "Lesanv"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Ger-tremen"
@@ -607,11 +607,11 @@ msgstr "Aotreañ"
msgid "Allow or deny access to your account information."
msgstr "Aotreañ pe nac'hañ ar moned da ditouroù ho kont."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ezhomm en deus an argerzh-mañ ur POST pe un DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
@@ -628,25 +628,25 @@ msgstr "Ne c'helloc'h ket adlavar ho alioù."
msgid "Already repeated that notice."
msgstr "Adlavaret o peus dija an ali-mañ."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Statud diverket."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "N'eo ket bet kavet a statud evit an ID-mañ"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "N'eo ket bet kavet."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -655,32 +655,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Diembreget eo ar furmad-se."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Pennroll %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s statud pennroll da %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Hizivadennoù a veneg %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Oberezhioù publik %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statud an holl !"
@@ -695,12 +695,12 @@ msgstr "Adkemeret evit %s"
msgid "Repeats of %s"
msgstr "Adkemeret eus %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Alioù merket gant %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Hizivadennoù merket gant %1$s e %2$s !"
@@ -757,7 +757,7 @@ msgid "Preview"
msgstr "Rakwelet"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Diverkañ"
@@ -797,11 +797,11 @@ msgstr "Dilammet eo bet an Avatar."
msgid "You already blocked that user."
msgstr "Stanket o peus dija an implijer-mañ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Stankañ an implijer-mañ"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -813,17 +813,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
-msgstr "Ket"
+msgstr "Nann"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Arabat stankañ an implijer-mañ"
@@ -832,20 +831,19 @@ msgstr "Arabat stankañ an implijer-mañ"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ya"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Diposubl eo enrollañ an titouroù stankañ."
@@ -892,9 +890,9 @@ msgstr "Distankañ an implijer-mañ"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Postañ war "
+msgstr "Postañ war %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -910,9 +908,9 @@ msgstr "N'eo ket ar c'hod-se evidoc'h !"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
+msgstr "Doare chomlec'h dianav %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -973,7 +971,7 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -1004,7 +1002,7 @@ msgstr "Dilemel ar poelad-se"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nann-luget."
@@ -1033,7 +1031,7 @@ msgid "Do not delete this notice"
msgstr "Arabat dilemel an ali-mañ"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Dilemel an ali-mañ"
@@ -1071,45 +1069,54 @@ msgstr "Design"
msgid "Design settings for this StatusNet site."
msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL fall evit al logo."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "N'eus ket tu kaout an dodenn : %s"
+msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Cheñch al logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo al lec'hienn"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Lakaat un dodenn all"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Dodenn al lec'hienn"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Dodenn evit al lec'hienn."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Dodenn al lec'hienn"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Kemmañ ar skeudenn foñs"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1117,57 +1124,65 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Gweredekaet"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Diweredekaet"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Adober gant ar skeudenn drekleur"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kemmañ al livioù"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Endalc'h"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barenn kostez"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Testenn"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Liammoù"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Implijout an talvoudoù dre ziouer"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Adlakaat an neuz dre ziouer."
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Adlakaat an arventennoù dre ziouer"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1177,7 +1192,7 @@ msgstr "Adlakaat an arventennoù dre ziouer"
msgid "Save"
msgstr "Enrollañ"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Enrollañ an design"
@@ -1330,7 +1345,6 @@ msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Dilemel"
@@ -1347,7 +1361,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Nullañ"
@@ -1362,7 +1375,6 @@ msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Ouzhpennañ"
@@ -1388,16 +1400,14 @@ msgstr ""
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nevez"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Penndibaboù"
+msgstr "Penndibaboù ar posteloù"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1436,9 +1446,8 @@ msgstr "Embann ur MicroID evit ma chomlec'h postel."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Enrollet eo bet an arventennoù design."
+msgstr "Enrollet eo bet an arventennoù postel."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1451,7 +1460,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "N'eo ket ur chomlec'h postel reizh."
@@ -1472,7 +1481,7 @@ msgstr ""
#: actions/emailsettings.php:391 actions/imsettings.php:348
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
#: actions/emailsettings.php:398
@@ -1491,15 +1500,13 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Nullet eo bet ar gadarnadenn."
+msgstr "Nullet eo bet kadarnadenn ar postel."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1509,9 +1516,8 @@ msgstr "N'eo ket ho postel."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Dilamet eo bet ar chomlec'h."
+msgstr "Dilamet eo bet ar chomlec'h postel."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1522,7 +1528,7 @@ msgstr "Chomlec'h postel ebet o tont."
#: actions/emailsettings.php:504 actions/emailsettings.php:528
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
-msgstr ""
+msgstr "Dibosupl eo hizivaat doser an implijer."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:508 actions/smssettings.php:581
@@ -1644,9 +1650,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Diposubl eo enrollañ ar profil."
+msgstr "Fazi en ur hizivaat ar profil a-bell."
#: actions/getfile.php:79
msgid "No such file."
@@ -1674,13 +1679,13 @@ msgstr "An implijer-mañ en deus dija ar roll-mañ."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "N'eo bet resisaet profil ebet"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "N'eus profil ebet gant an ID-mañ."
@@ -1814,7 +1819,7 @@ msgstr "Lakaat an implijer-mañ da verour"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Oberezhioù %s"
@@ -1943,9 +1948,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Penndibaboù"
+msgstr "Penndibaboù ar bostelerezh prim"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2019,9 +2023,8 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Nullet eo bet ar gadarnadenn."
+msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2054,9 +2057,9 @@ msgid "Invites have been disabled."
msgstr "Diweredekaat eo bet ar bedadennoù."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
+msgstr "Rankout a reoc'h bezañ luget evit pediñ implijerien all e %s."
#: actions/invite.php:72
#, php-format
@@ -2118,7 +2121,7 @@ msgstr "Kemennadenn bersonel"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
@@ -2194,43 +2197,43 @@ msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
msgid "%1$s left group %2$s"
msgstr "%1$s en deus kuitaet ar strollad %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Kevreet oc'h dija."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
"evit en ober."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Kevreañ"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Kevreañ d'al lec'hienn"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Kaout soñj"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
"urzhiataeroù rannet pe publik !"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ha kollet o peus ho ker-tremen ?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2238,14 +2241,17 @@ msgstr ""
"Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-"
"tremen a-benn enrollañ ho penndibaboù."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Kevreit gant ho anv implijer hag ho ker tremen. N'o peus ket a anv implijer "
-"evit c'hoazh ? [Krouit](%%action.register%%) ur gont nevez."
+"N'o peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur "
+"gont nevez."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2438,30 +2444,30 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "N'en deus ket an ali a profil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Statud %1$s war %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "seurt an danvez "
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2564,7 +2570,7 @@ msgid "6 or more characters"
msgstr "6 arouezenn pe muioc'h"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Kadarnaat"
@@ -2576,11 +2582,11 @@ msgstr "Memestra eget ar ger tremen a-us"
msgid "Change"
msgstr "Kemmañ"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Ne glot ket ar gerioù-tremen."
@@ -2601,7 +2607,7 @@ msgid "Password saved."
msgstr "Ger-tremen enrollet."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Hentoù"
@@ -2765,9 +2771,9 @@ msgid "People search"
msgstr "Klask tud"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "N'eo ket reizh ar merk-se : %s"
+msgstr "N'eo ket reizh ar merk-se : %s."
#: actions/peopletag.php:142
#, php-format
@@ -2775,14 +2781,15 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Danvez direizh an ali"
+msgstr "Danvez direizh an ali."
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
+"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
+"lec'hienn \"%2$s\"."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2792,6 +2799,8 @@ msgstr "Arventennoù ar profil"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
+"Gellout a reoc'h hizivaat titouroù ho profil evit ma ouifemp muioc'h a draoù "
+"diwar ho penn."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2799,51 +2808,51 @@ msgstr "Titouroù ar profil"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Anv klok"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pajenn degemer"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
-msgstr ""
+msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Buhezskrid"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Lec'hiadur"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Rannañ va lec'hiadur pa bostan un ali."
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2855,6 +2864,8 @@ msgstr "Balizennoù"
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant "
+"virgulennoù pe esaouennoù"
#: actions/profilesettings.php:151
msgid "Language"
@@ -2870,14 +2881,16 @@ msgstr "Takad eur"
#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "Pehini eo gwerzhid-eur boaz ?"
#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
+"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
+"evit an implijerien nann-denel)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
@@ -2897,11 +2910,11 @@ msgstr "Balizenn direizh : \"%s\""
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre."
#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr ""
+msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
@@ -2919,32 +2932,32 @@ msgstr "Enrollet eo bet an arventennoù."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "Dreist da bevennoù ar bajenn (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Dibosupl eo adtapout al lanv foran."
#: actions/public.php:130
#, php-format
msgid "Public timeline, page %d"
-msgstr ""
+msgstr "Lanv foran - pajenn %d"
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr ""
+msgstr "Lanv foran"
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn gwazh foran (RSS 1.0)"
#: actions/public.php:164
msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "Neudenn gwazh foran (RSS 2.0)"
#: actions/public.php:168
msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "Neudenn gwazh foran (Atom)"
#: actions/public.php:188
#, php-format
@@ -2952,6 +2965,7 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
#: actions/public.php:191
msgid "Be the first to post!"
@@ -2962,6 +2976,8 @@ msgstr "Bezit an hini gentañ da bostañ !"
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
+"gentañ da embann un dra !"
#: actions/public.php:242
#, php-format
@@ -2979,15 +2995,17 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
+"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr ""
+msgstr "Koumoulenn a merkoù foran"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
#: actions/publictagcloud.php:69
#, php-format
@@ -2996,7 +3014,7 @@ msgstr ""
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Bezit an hini gentañ oc'h embann unan !"
#: actions/publictagcloud.php:75
#, php-format
@@ -3004,10 +3022,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
+"gentañ da embann un dra !"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
-msgstr ""
+msgstr "Koumoulenn merkoù"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -3023,29 +3043,31 @@ msgstr "N'eo ket ur c'hod adtapout an dra-mañ."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Kod adtapout evit un implijer dizanv."
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
-msgstr ""
+msgstr "Ur fazi 'zo bet gant ar c'hod kadarnaat."
#: actions/recoverpassword.php:97
msgid "This confirmation code is too old. Please start again."
-msgstr ""
+msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij."
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "Dibosupl eo hizivaat an implijer gant ar chomlec'h postel gwiriekaet."
#: actions/recoverpassword.php:152
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"M'o peus disoñjet pe kollet ho ger-tremen, e c'helloc'h kaout unan nevez hag "
+"a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
@@ -3053,11 +3075,11 @@ msgstr "Adtapout ar ger-tremen"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Lesanv pe chomlec'h postel"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel o peus enrollet."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -3093,114 +3115,142 @@ msgstr "Lakait ul lesanv pe ur chomlec'h postel."
#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
-msgstr ""
+msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se."
#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr ""
+msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel."
#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
+"Kaset eo bet deoc'h, d'ar chomlec'h postel termenet en ho kont, an titouroù "
+"ret evit gouzout penaos adtapout o ger-tremen."
#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
-msgstr ""
+msgstr "Adderaouekadur dic'hortoz ar ger-tremen."
#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
-msgstr ""
+msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
+"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
+"enskrivañ."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Digarezit, kod pedadenn direizh."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
-msgstr ""
+msgstr "Krouet eo bet ar gont."
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Krouiñ ur gont"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
-msgstr ""
+msgstr "N'eo ket aotreet krouiñ kontoù."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
+"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
+"gont."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Implijet eo dija ar chomlec'h postel-se."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
-msgstr ""
+msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 arouezenn pe muioc'h. Rekis."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Memestra hag ar ger-tremen a-us. Rekis."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Postel"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3219,11 +3269,13 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
+"(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat "
+"ho chomlec'h.)"
#: actions/remotesubscribe.php:98
#, php-format
@@ -3235,11 +3287,11 @@ msgstr ""
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "Koumanant eus a-bell"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "Koumanantiñ d'un implijer pell"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -3264,7 +3316,7 @@ msgstr "En em enskrivañ"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "URL direizh evit ar profil (furmad fall)"
#: actions/remotesubscribe.php:168
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -3272,15 +3324,15 @@ msgstr ""
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "Lec'hel eo ar profil-mañ ! Kevreit evit koumananti."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
-msgstr ""
+msgstr "Dibosupl eo kaout ur jedaouer reked."
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
@@ -3294,7 +3346,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h."
msgid "You already repeated that notice."
msgstr "Adkemeret o peus dija an ali-mañ."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Adlavaret"
@@ -3363,7 +3415,7 @@ msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
msgid "User doesn't have this role."
msgstr "n'en deus ket an implijer-mañ ar rol-se."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3377,7 +3429,7 @@ msgstr "Er poull-traezh emañ dija an implijer."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Dalc'hoù"
@@ -3404,7 +3456,7 @@ msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
msgid "Save site settings"
-msgstr ""
+msgstr "Enrollañ arventennoù al lec'hienn"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
@@ -3420,7 +3472,7 @@ msgid "Icon"
msgstr "Arlun"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Anv"
@@ -3431,7 +3483,7 @@ msgid "Organization"
msgstr "Aozadur"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Deskrivadur"
@@ -3468,11 +3520,11 @@ msgstr "Sekred an implijer"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "URL ar jedouer reked"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "URL ar jedouer moned"
#: actions/showapplication.php:283
msgid "Authorize URL"
@@ -3487,6 +3539,7 @@ msgstr ""
#: actions/showapplication.php:309
msgid "Are you sure you want to reset your consumer key and secret?"
msgstr ""
+"Ha sur oc'h o peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?"
#: actions/showfavorites.php:79
#, php-format
@@ -3500,12 +3553,12 @@ msgstr ""
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "Gwazh evit mignoned %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "Gwazh evit mignoned %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
@@ -3572,17 +3625,17 @@ msgstr "Obererezh ar strollad"
#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn alioù ar strollad %s (RSS 1.0)"
#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Neudenn alioù ar strollad %s (RSS 2.0)"
#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Neudenn alioù ar strollad %s (Atom)"
#: actions/showgroup.php:355
#, php-format
@@ -3667,17 +3720,17 @@ msgstr "%1$s, pajenn %2$d"
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn an alioù evit %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Neudenn an alioù evit %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
@@ -3756,7 +3809,7 @@ msgstr "Yezh \"%s\" dizanv."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "Ar vevenn izelañ evit an destenn a zo 0 arouezenn (anvevenn)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3772,7 +3825,7 @@ msgstr "Anv al lec'hienn"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Anv ho lec'hienn, evel \"Microblog ho embregerezh\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -3792,7 +3845,7 @@ msgstr ""
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "Chomlec'h postel daremprediñ ho lec'hienn"
#: actions/siteadminpanel.php:245
msgid "Local"
@@ -3839,9 +3892,8 @@ msgid "Site Notice"
msgstr "Ali al lec'hienn"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Kemennadenn nevez"
+msgstr "Kemmañ ur gemennadenn hag a zo diwar-benn al lec'hienn a-bezh"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
@@ -3858,6 +3910,8 @@ msgstr "Testenn ali al lec'hienn"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
+"Testenn an ali diwar-benn al lec'hienn a-bezh (255 arouezenn d'ar muiañ ; "
+"HTML gweredekaet)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
@@ -3874,6 +3928,8 @@ msgstr "Arventennoù SMS"
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
+"Gellout a reoc'h resevout kemmadennoù SMS dre postel o tont eus %%site.name%"
+"%."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:97
@@ -3882,19 +3938,18 @@ msgstr "Dizimplijadus eo an SMS."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Chomlec'h postelerezh prim"
+msgstr "Chomlec'h SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Niverenn pellgomz bet gwiriekaet evit resevout SMSoù."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:142
@@ -3904,11 +3959,10 @@ msgstr "Kod kadarnaat"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Lakait ar c'hod o peus resevet war ho pellgomzer hezoug."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Kadarnaat"
@@ -3925,9 +3979,8 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Penndibaboù"
+msgstr "Penndibaboù an SMSoù"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -3938,9 +3991,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Penndibaboù enrollet"
+msgstr "Penndibaboù an SMSoù enrollet."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -3976,9 +4028,8 @@ msgstr "Direizh eo ar c'hod gwiriekaat-mañ."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Nullet eo bet ar gadarnadenn."
+msgstr "Nullet eo bet ar gadarnadenn SMS."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -3988,14 +4039,13 @@ msgstr "n'eo ket ho niverenn pellgomz."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Niverenn bellgomz evit an SMS"
+msgstr "Dilamet eo bet an niverenn bellgomz evit an SMSoù."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
-msgstr ""
+msgstr "Pourvezer pellgomzerezh hezoug"
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:516
@@ -4018,7 +4068,7 @@ msgstr "N'eo bet lakaet kod ebet"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Prim"
@@ -4064,7 +4114,7 @@ msgstr ""
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "URL an danevell"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
@@ -4140,16 +4190,16 @@ msgstr ""
#: actions/subscriptions.php:52
#, php-format
msgid "%s subscriptions"
-msgstr ""
+msgstr "Koumanantoù %s"
#: actions/subscriptions.php:54
#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr ""
+msgstr "Koumanantoù %1$s, pajenn %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Heuliañ a reoc'h alioù an dud-se."
#: actions/subscriptions.php:69
#, php-format
@@ -4182,26 +4232,26 @@ msgstr "SMS"
#: actions/tag.php:69
#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
+msgstr "Alioù merket gant %1$s, pajenn %2$d"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Gwazh an alioù evit ar merk %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Gwazh an alioù evit ar merk %s (RSS 2.0)"
#: actions/tag.php:99
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "Gwazh an alioù evit ar merk %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
-msgstr ""
+msgstr "Arguzenn ID ebet."
#: actions/tagother.php:65
#, php-format
@@ -4226,6 +4276,8 @@ msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha _), dispartiet "
+"gant virgulennoù pe gant esaouennoù"
#: actions/tagother.php:193
msgid ""
@@ -4261,9 +4313,8 @@ msgid "User is not silenced."
msgstr ""
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "N'eus profil id ebet er reked."
+msgstr "N'eus profil ID ebet er reked."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4355,7 +4406,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Aotre implijout"
@@ -4405,27 +4456,27 @@ msgstr ""
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel."
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "N'eo ket reizh URL an avatar \"%s\"."
#: actions/userauthorization.php:350
#, php-format
@@ -4435,11 +4486,11 @@ msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr ""
+msgstr "Design ar profil"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
@@ -4476,29 +4527,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Hizivadennoù eus %1$s e %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Aozerien"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4506,7 +4557,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4514,39 +4565,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Pluginoù"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Stumm"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Aozer(ien)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4585,52 +4636,52 @@ msgid "Could not update message with new URI."
msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
-msgstr ""
+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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
#: classes/Subscription.php:78
msgid "Already subscribed!"
@@ -4655,7 +4706,7 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Dibosupl eo paouez gant ar c'houmanant."
#: classes/User.php:363
#, php-format
@@ -4668,20 +4719,20 @@ msgstr "Dibosupl eo krouiñ ar strollad."
#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr ""
+msgstr "Dibosupl eo termeniñ URI ar strollad."
#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr ""
+msgstr "Dibosupl eo en em enskrivañ d'ar strollad."
#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr ""
+msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
-msgstr ""
+msgstr "Kemmañ arventennoù ho profil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:116
@@ -4696,12 +4747,12 @@ msgstr "Cheñch ar ger-tremen"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
msgid "Change email handling"
-msgstr ""
+msgstr "Kemmañ tretadur ar posteloù"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
msgid "Design your profile"
-msgstr ""
+msgstr "Krouit ho profil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
@@ -4725,188 +4776,188 @@ msgid "Untitled page"
msgstr "Pajenn hep anv"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Liammañ d'ar servijoù"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Kevreañ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr ""
+msgstr "Kemmañ arventennoù al lec'hienn"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Merañ"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Pediñ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Digevreañ diouzh al lec'hienn"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Digevreañ"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Krouiñ ur gont"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "En em enskrivañ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kevreañ d'al lec'hienn"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Kevreañ"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Sikour din !"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Skoazell"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Klask tud pe un tamm testenn"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Klask"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Ali al lec'hienn"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Selloù lec'hel"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Ali ar bajenn"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Skoazell"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Diwar-benn"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAG"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "AIH"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Prevezded"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Mammenn"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Darempred"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Badj"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Aotre-implijout ar meziant StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4914,13 +4965,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
+msgstr "**%%site.name%%** a zo ur servij microblogging."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4929,54 +4980,54 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
-msgstr ""
+msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Kent"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -4984,11 +5035,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5000,83 +5051,83 @@ msgstr ""
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
msgid "Changes to that panel are not allowed."
-msgstr ""
+msgstr "N'eo ket aotreet kemmañ ar panell-se"
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "N'eo ket bet emplementet showForm()."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "N'eo ket bet emplementet saveSettings()."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
#: lib/adminpanelaction.php:284
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Dibosupl eo dilemel an arventennoù krouiñ."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
-msgstr ""
+msgstr "Arventennoù diazez al lec'hienn"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Lec'hienn"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
-msgstr ""
+msgstr "Kefluniadur ar c'hrouiñ"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Design"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
-msgstr ""
+msgstr "Kefluniadur an implijer"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Implijer"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
-msgstr ""
+msgstr "Kefluniadur ar moned"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
-msgstr ""
+msgstr "Kefluniadur an hentoù"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
-msgstr ""
+msgstr "Kefluniadur an dalc'hoù"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Kemmañ ali al lec'hienn"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
-msgstr ""
+msgstr "Kefluniadur ar primoù"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5088,23 +5139,23 @@ msgstr "Kemmañ an arload"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Arlun evit ar poellad-mañ"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
#, php-format
msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "Diskrivit ho poellad gant %d arouezenn"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
msgid "Describe your application"
-msgstr ""
+msgstr "Deskrivit ho poellad"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "URL pajenn degemer ar poellad-mañ"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
@@ -5114,17 +5165,17 @@ msgstr "Mammenn URL"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "An aozadur e karg eus ar poellad-mañ"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "URL pajenn degemer an aozadur-se"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL davet pehini e o ret adkas goude bezañ kevreet"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
@@ -5139,7 +5190,7 @@ msgstr "Burev"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Seurt ar poellad, merdeer pe burev"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
@@ -5163,21 +5214,19 @@ msgstr "Nullañ"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Lenn-skrivañ"
+msgstr "lenn-skrivañ"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Lenn hepken"
+msgstr "lenn hepken"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprouet d'an %1$s - moned \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
@@ -5209,55 +5258,56 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
-msgstr ""
+msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
-msgstr ""
+msgstr "N'eo ket aotreet kemmañ ar ger-tremen"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Disoc'hoù an urzhiad"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Urzhiad bet klokaet"
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "C'hwitet en deus an urzhiad"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "N'eus ali ebet gant an id-mañ."
#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
-msgstr ""
+msgstr "N'eus ali nevez evit an implijer-mañ"
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
+msgstr "Dibosupl eo kavout un implijer gant al lesanv %s"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr ""
+msgstr "Dibosupl eo kavout un implijer lec'hel gant al lesanv %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
+"N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
@@ -5273,14 +5323,17 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Koumanatoù : %1$s\n"
+"Tud koumanantet : %2$s\n"
+"kemennadennoù : %3$s"
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Ali bet ouzhpennet d'ar pennroll."
#: lib/command.php:323
msgid "You are already a member of that group"
-msgstr ""
+msgstr "Ezel oc'h eus ar strollad-mañ dija."
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -5292,9 +5345,9 @@ msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
+msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5304,14 +5357,14 @@ msgstr "Anv klok : %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Lec'hiadur : %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Lec'hienn Web : %s"
@@ -5332,11 +5385,11 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn o peus lakaet."
+"arouezenn o peus lakaet"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5347,15 +5400,15 @@ msgstr "Kaset eo bet ar gemennadenn war eeun da %s."
#: lib/command.php:494
msgid "Error sending direct message."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr ""
+msgstr "Ne c'helloc'h ket adkemer ho ali"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr ""
+msgstr "Ali bet adkemeret dija"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
@@ -5410,7 +5463,7 @@ msgstr ""
#: lib/command.php:685
msgid "Notification off."
-msgstr ""
+msgstr "Kemennoù diweredekaet."
#: lib/command.php:687
msgid "Can't turn off notification."
@@ -5418,7 +5471,7 @@ msgstr ""
#: lib/command.php:708
msgid "Notification on."
-msgstr ""
+msgstr "Kemennoù gweredekaet"
#: lib/command.php:710
msgid "Can't turn on notification."
@@ -5426,7 +5479,7 @@ msgstr ""
#: lib/command.php:723
msgid "Login command is disabled"
-msgstr ""
+msgstr "Diweredekaet eo an urzhiad evit digeriñ un dalc'h"
#: lib/command.php:734
#, php-format
@@ -5462,7 +5515,7 @@ msgstr[1] "These people are subscribed to you:"
#: lib/command.php:822
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "N'oc'h ezel eus strollad ebet."
#: lib/command.php:824
#, fuzzy
@@ -5539,7 +5592,7 @@ msgstr ""
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Hizivadennoù dre SMS"
#: lib/connectsettingsaction.php:120
msgid "Connections"
@@ -5766,7 +5819,7 @@ msgstr "Digeriñ ur gont nevez"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
msgid "Email address confirmation"
-msgstr ""
+msgstr "Kadarnadur ar chomlec'h postel"
#. TRANS: Body for address confirmation email.
#: lib/mail.php:177
@@ -5792,8 +5845,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5809,19 +5869,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr ""
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Chomlec'h postel nevez evit embann e %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5835,30 +5895,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Statud %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
-msgstr ""
+msgstr "Kadarnadur SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5875,13 +5935,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Kemenadenn personel nevez a-berzh %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5901,13 +5961,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5929,21 +5989,24 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"Ar gaozeadenn klok a c'hell bezañ lennet amañ :\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5980,7 +6043,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "eus"
@@ -6025,7 +6088,7 @@ msgstr ""
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Mankout a ra un doser padennek."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
@@ -6050,7 +6113,7 @@ msgstr ""
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr "Klaskit implijout ur furmad %s all."
#: lib/mediafile.php:275
#, php-format
@@ -6134,23 +6197,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "e"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "en amdro"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Adkemeret gant"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Respont d'an ali-mañ"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Respont"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Ali adkemeret"
@@ -6168,11 +6231,11 @@ msgstr "Kas ur blinkadenn d'an implijer-mañ"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
-msgstr ""
+msgstr "Ur fazi 'zo bet en ur ensoc'hañ ar profil nevez"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
#: lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -6223,7 +6286,7 @@ msgstr "Ar c'hemenadennoù kaset ganeoc'h"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Dianav"
@@ -6260,7 +6323,7 @@ msgstr "Keidenn pemdeziek"
msgid "All groups"
msgstr "An holl strolladoù"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6274,7 +6337,7 @@ msgstr "Strolladoù implijerien"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr ""
+msgstr "Merkoù nevez"
#: lib/publicgroupnav.php:88
msgid "Featured"
@@ -6284,7 +6347,7 @@ msgstr ""
msgid "Popular"
msgstr "Poblek"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6305,7 +6368,7 @@ msgstr "Adkregiñ gant an ali-mañ"
msgid "Revoke the \"%s\" role from this user"
msgstr "Stankañ an implijer-mañ eus ar strollad-se"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6403,6 +6466,50 @@ msgstr ""
msgid "None"
msgstr "Hini ebet"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Fazi en ur hizivaat ar profil a-bell."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "An implijerien an efedusañ"
@@ -6469,9 +6576,8 @@ msgid "Moderate"
msgstr "Habaskaat"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "Strolladoù implijerien"
+msgstr "Rol an implijer"
#: lib/userprofile.php:366
msgctxt "role"
@@ -6484,56 +6590,56 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
@@ -6545,7 +6651,7 @@ msgstr "n'eo ket %s ul liv reizh !"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
#: lib/xmppmanager.php:403
#, php-format
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 55bbac196..2b5a2076d 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,7 +1,6 @@
# Translation of StatusNet to Catalan
#
# Author@translatewiki.net: Aleator
-# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Paucabot
# Author@translatewiki.net: Toniher
# --
@@ -11,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:18+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:01+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -24,15 +23,14 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Accés"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "Desa els paràmetres del lloc"
+msgstr "Paràmetres d'accés al lloc"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
@@ -74,9 +72,8 @@ msgstr "Tancat"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "Desa els paràmetres del lloc"
+msgstr "Desa els paràmetres d'accés"
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
@@ -90,24 +87,24 @@ msgid "Save"
msgstr "Desa"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "No existeix la pàgina."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -117,134 +114,141 @@ msgstr "No existeix la pàgina."
#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
-msgstr "No existeix aquest usuari."
+msgstr "No existeix l'usuari."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
-#, fuzzy, php-format
+#: actions/all.php:90
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s perfils blocats, pàgina %d"
+msgstr "%1$s i amics, pàgina %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s i amics"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Canal dels amics de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Canal dels amics de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Canal dels amics de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res "
+"Aquesta és la línia temporal de %s i amics, però ningú hi ha publicat res "
"encara."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
+"Proveu de subscriure més gent, [uniu-vos a un grup](%%action.groups%%) o "
+"publiqueu quelcom personal."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+"Podeu provar d'[avisar %1$s](../%2$s) des del seu perfil o [publiqueu "
+"quelcom per reclamar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%"
+"3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"Per què no [registreu un compte](%%%%action.register%%%%) i aviseu %s o "
+"publiqueu un avís a la seva atenció."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Un mateix i amics"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualitzacions de %1$s i amics a %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
-#, fuzzy
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "No s'ha trobat el mètode API!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Aquest mètode requereix POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
+"Heu d'especificar un paràmetre anomenat 'device' (dispositiu) amb un valor "
+"dels següents: sms, im, none (cap)"
-#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "No s'ha pogut actualitzar l'usuari."
@@ -259,13 +263,12 @@ msgid "User has no profile."
msgstr "L'usuari no té perfil."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
-msgstr "No s'ha pogut guardar el perfil."
+msgstr "No s'ha pogut desar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -274,6 +277,8 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la "
+"configuració actual."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
@@ -282,15 +287,13 @@ msgstr ""
#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
msgid "Unable to save your design settings."
-msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+msgstr "No s'han pogut desar els paràmetres de disseny."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
-msgstr "No s'ha pogut actualitzar l'usuari."
+msgstr "No s'ha pogut actualitzar el vostre disseny."
#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
@@ -298,11 +301,11 @@ msgstr "No podeu bloquejar-vos a vosaltres mateixos!"
#: actions/apiblockcreate.php:126
msgid "Block user failed."
-msgstr "Ha fallat el bloqueig d'usuari."
+msgstr "Ha fallat el blocatge de l'usuari."
#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
-msgstr "Ha fallat el desbloqueig d'usuari."
+msgstr "Ha fallat el desblocatge de l'usuari."
#: actions/apidirectmessage.php:89
#, php-format
@@ -324,216 +327,213 @@ msgstr "Missatges directes a %s"
msgid "All the direct messages sent to %s"
msgstr "Tots els missatges directes enviats a %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "No hi ha text al missatge!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "És massa llarg. La mida màxima del missatge és %d caràcters."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
-msgstr "No has escrit cap usuari receptor."
+msgstr "No s'ha trobat l'usuari destinatari."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"No es pot enviar missatges directes a usuaris que no siguin els vostres "
"amics."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
-msgstr "No s'ha trobat cap estatus amb aquesta ID."
+msgstr "No s'ha trobat cap estat amb aquest ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Aquest estat ja és un preferit."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
-msgstr "No es pot crear favorit."
+msgstr "No es pot crear el preferit."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "L'estat no és un preferit."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
-msgstr "No s'ha pogut suprimir el preferit."
+msgstr "No s'ha pogut eliminar el preferit."
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
-msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
+msgstr "No s'ha pogut seguir l'usuari: l'usuari no existeix."
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr ""
-"No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista."
+msgstr "No s'ha pogut seguir l'usuari: %s ja està a la vostra llista."
#: actions/apifriendshipsdestroy.php:109
msgid "Could not unfollow user: User not found."
-msgstr "No pots subscriure't a aquest usuari: l'usuari no existeix."
+msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself."
-msgstr "No podeu deixar de seguir-vos a vosaltres mateixos."
+msgstr "No podeu deixar de seguir-vos a un mateix."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
-msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
+msgstr "Cal proporcionar dos ids d'usuari o screen_names."
#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
msgstr "No s'ha pogut determinar l'usuari d'origen."
#: actions/apifriendshipsshow.php:142
-#, fuzzy
msgid "Could not find target user."
-msgstr "No es pot trobar cap estatus."
+msgstr "No s'ha pogut trobar l'usuari de destinació."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
"espais."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Aquest sobrenom ja existeix. Prova un altre. "
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Sobrenom no vàlid."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "La pàgina personal no és un URL vàlid."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
-msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
+msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descripció és massa llarga (màx. %d caràcters)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Hi ha massa àlies! Màxim %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "L'àlies no és vàlid: \"%s\"."
+msgstr "L'àlies no és vàlid: «%s»."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "L'àlies no pot ser el mateix que el sobrenom."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "No s'ha trobat el grup."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Ja sou membre del grup."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "L'administrador us ha blocat del grup."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "No sou un membre del grup."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s."
+msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Grups de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s grups dels que %2$s és membre."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s grups"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "grups sobre %s"
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "No s'ha proporcionat cap paràmetre oauth_token."
#: actions/apioauthauthorize.php:106
-#, fuzzy
msgid "Invalid token."
-msgstr "Mida invàlida."
+msgstr "El testimoni no és vàlid."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -561,11 +561,13 @@ msgid ""
"The request token %s has been authorized. Please exchange it for an access "
"token."
msgstr ""
+"S'ha autoritzat el testimoni de sol·licitud %s. Si us plau, canvieu-lo per "
+"un testimoni d'accés."
#: actions/apioauthauthorize.php:227
#, php-format
msgid "The request token %s has been denied and revoked."
-msgstr ""
+msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s."
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
@@ -581,11 +583,11 @@ msgstr "Enviament de formulari inesperat."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Una aplicació voldria connectar-se al vostre compte"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "Permet o denega l'accés"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -594,14 +596,17 @@ msgid ""
"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
"give access to your %4$s account to third parties you trust."
msgstr ""
+"L'aplicació <strong>%1$s</strong>, de <strong>%2$s</strong>, voldria obtenir "
+"l'habilitat de <strong>%3$s</strong> les dades del vostre compte %4$s. Només "
+"hauríeu de donar accés al compte %4$s a terceres parts en què confieu."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -609,8 +614,8 @@ msgid "Nickname"
msgstr "Sobrenom"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasenya"
@@ -624,15 +629,15 @@ msgstr "Permet"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "Permet o denega l'accés a la informació del vostre compte."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Aquest mètode requereix POST o DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
-msgstr "No pots eliminar l'estatus d'un altre usuari."
+msgstr "No podeu eliminar l'estat d'un altre usuari."
#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
@@ -647,79 +652,79 @@ msgstr "No podeu repetir els vostres propis avisos."
msgid "Already repeated that notice."
msgstr "Avís duplicat."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
-msgstr "S'ha suprimit l'estat."
+msgstr "S'ha eliminat l'estat."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "No s'ha trobat cap estatus amb la ID trobada."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Massa llarg. La longitud màxima és de %d caràcters."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "No s'ha trobat."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
msgstr "El format no està implementat."
-#: actions/apitimelinefavorites.php:109
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:110
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Preferits de %s"
+msgstr "%1$s / Preferits de %2$s"
-#: actions/apitimelinefavorites.php:118
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:119
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s actualitzacions favorites per %s / %s."
+msgstr "%1$s actualitzacions preferides per %2$s / %2$s."
-#: actions/apitimelinementions.php:117
-#, fuzzy, php-format
+#: actions/apitimelinementions.php:118
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Notificacions contestant a %2$s"
+msgstr "%1$s / Actualitzacions que mencionen %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
+msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s línia temporal pública"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr "%s notificacions de tots!"
+msgstr "%s actualitzacions de tothom!"
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
-msgstr "Repetida a %s"
+msgstr "Repetit a %s"
#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repeticions de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Aviso etiquetats amb %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
@@ -741,7 +746,7 @@ msgstr "Cap mida."
#: actions/avatarbynickname.php:69
msgid "Invalid size."
-msgstr "Mida invàlida."
+msgstr "La mida no és vàlida."
#. TRANS: Link description in user account settings menu.
#: actions/avatarsettings.php:67 actions/showgroup.php:230
@@ -758,9 +763,8 @@ msgstr ""
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
msgid "User without matching profile."
-msgstr "Usuari sense perfil coincident"
+msgstr "L'usuari que no coincideix amb cap perfil"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:254
@@ -778,9 +782,9 @@ msgid "Preview"
msgstr "Vista prèvia"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
-msgstr "Suprimeix"
+msgstr "Elimina"
#: actions/avatarsettings.php:166 actions/grouplogo.php:236
msgid "Upload"
@@ -814,39 +818,41 @@ msgstr "Error en actualitzar avatar."
#: actions/avatarsettings.php:397
msgid "Avatar deleted."
-msgstr "S'ha suprimit l'avatar."
+msgstr "S'ha eliminat l'avatar."
#: actions/block.php:69
msgid "You already blocked that user."
msgstr "Ja heu blocat l'usuari."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
-msgstr "Usuari bloquejat."
+msgstr "Bloca l'usuari"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Esteu segur que voleu blocar l'usuari? Tot seguit, se'n cancel·larà la "
+"vostra subscripció, no us podrà subscriure en el futur, i no en rebreu cap "
+"avís de respostes @."
#. TRANS: Button label on the user block form.
#. TRANS: Button label on the delete application form.
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquis l'usuari"
@@ -855,22 +861,21 @@ msgstr "No bloquis l'usuari"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
-msgstr "Bloquejar aquest usuari"
+msgstr "Bloca aquest usuari"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
-msgstr "Error al guardar la informació del block."
+msgstr "No s'ha pogut desar la informació del bloc."
#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
@@ -892,14 +897,13 @@ msgid "%s blocked profiles"
msgstr "%s perfils blocats"
#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s perfils blocats, pàgina %d"
+msgstr "%1$s perfils blocats, pàgina %2$d"
#: actions/blockedfromgroup.php:115
-#, fuzzy
msgid "A list of the users blocked from joining this group."
-msgstr "La llista dels usuaris d'aquest grup."
+msgstr "Una llista d'usuaris que han estat blocats d'afegir-se a aquest grup."
#: actions/blockedfromgroup.php:288
msgid "Unblock user from group"
@@ -917,7 +921,7 @@ msgstr "Desbloca l'usuari"
#: actions/bookmarklet.php:51
#, php-format
msgid "Post to %s"
-msgstr "Publicar a %s"
+msgstr "Publica a %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -929,7 +933,7 @@ msgstr "Codi de confirmació no trobat. "
#: actions/confirmaddress.php:85
msgid "That confirmation code is not for you!"
-msgstr "Aquest codi de confirmació no és per a tu!"
+msgstr "Aquest codi de confirmació no és vostre!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
@@ -970,7 +974,7 @@ msgstr "Confirmeu l'adreça de correu electrònic"
#: actions/confirmaddress.php:161
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
+msgstr "L'adreça «%s» ha estat confirmada per al vostre compte."
#: actions/conversation.php:99
msgid "Conversation"
@@ -982,9 +986,8 @@ msgid "Notices"
msgstr "Avisos"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "Heu d'iniciar una sessió per editar un grup."
+msgstr "Heu d'haver iniciat una sessió per eliminar una aplicació."
#: actions/deleteapplication.php:71
msgid "Application not found."
@@ -997,13 +1000,13 @@ msgstr "No sou el propietari d'aquesta aplicació."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
-msgstr "Ha ocorregut algun problema amb la teva sessió."
+msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
msgid "Delete application"
-msgstr "Esborra aplicació"
+msgstr "Elimina l'aplicació"
#: actions/deleteapplication.php:149
msgid ""
@@ -1011,12 +1014,14 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"Esteu segur que voler eliminar l'aplicació? Això netejarà totes les dades de "
+"l'aplicació de la base de dades, incloent-hi totes les connexions d'usuari "
+"existents."
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "No es pot esborrar la notificació."
+msgstr "No eliminis l'aplicació"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
@@ -1029,44 +1034,44 @@ msgstr "Elimina aquesta aplicació"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "No heu iniciat una sessió."
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
-msgstr "No es pot esborrar la notificació."
+msgstr "No es pot eliminar l'avís."
#: actions/deletenotice.php:103
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
-"Estàs a punt d'eliminar permanentment un avís. Una vegada fet, no es podrà "
+"Esteu a punt d'eliminar permanentment un avís. Una vegada fet, no es podrà "
"desfer."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
-msgstr "Eliminar nota."
+msgstr "Elimina l'avís"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
-msgstr "N'estàs segur que vols eliminar aquesta notificació?"
+msgstr "Esteu segur que voleu eliminar aquest avís?"
#. TRANS: Submit button title for 'No' when deleting a notice.
#: actions/deletenotice.php:151
msgid "Do not delete this notice"
-msgstr "No elimineu aquest avís"
+msgstr "No eliminis aquest avís"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
-msgstr "Eliminar aquesta nota"
+msgstr "Elimina aquest avís"
#: actions/deleteuser.php:67
msgid "You cannot delete users."
-msgstr "No podeu suprimir els usuaris."
+msgstr "No podeu eliminar els usuaris."
#: actions/deleteuser.php:74
msgid "You can only delete local users."
@@ -1074,18 +1079,20 @@ msgstr "Només podeu eliminar usuaris locals."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
-msgstr "Suprimeix l'usuari"
+msgstr "Elimina l'usuari"
#: 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 ""
+"Esteu segur que voleu eliminar l'usuari? S'esborraran totes les dades de "
+"l'usuari de la base de dades, sense cap còpia de seguretat."
#. TRANS: Submit button title for 'Yes' when deleting a user.
#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
-msgstr "Suprimeix l'usuari"
+msgstr "Elimina l'usuari"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
@@ -1098,45 +1105,53 @@ msgstr "Disseny"
msgid "Design settings for this StatusNet site."
msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "L'URL del logotip no és vàlid."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Canvia el logotip"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logotip del lloc"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Canvia el tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Tema del lloc"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema del lloc."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Tema personalitzat"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Canvia la imatge de fons"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fons"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1145,57 +1160,65 @@ 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:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Activada"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivada"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activa o desactiva la imatge de fons."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Posa en mosaic la imatge de fons"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Canvia els colors"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Contingut"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Enllaços"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avançat"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "CSS personalitzat"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Utilitza els paràmetres per defecte"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Restaura els dissenys per defecte"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Torna a restaurar al valor per defecte"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1205,13 +1228,13 @@ msgstr ""
msgid "Save"
msgstr "Guardar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Desa el disseny"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr "Aquesta notificació no és un favorit!"
+msgstr "Aquesta avís no és un preferit!"
#: actions/disfavor.php:94
msgid "Add to favorites"
@@ -1220,7 +1243,7 @@ msgstr "Afegeix als preferits"
#: actions/doc.php:158
#, php-format
msgid "No such document \"%s\""
-msgstr "No existeix el document \"%s\""
+msgstr "No existeix el document «%s»"
#: actions/editapplication.php:54
msgid "Edit Application"
@@ -1236,33 +1259,28 @@ msgid "No such application."
msgstr "No hi ha tal aplicació."
#: actions/editapplication.php:161
-#, fuzzy
msgid "Use this form to edit your application."
-msgstr "Utilitza aquest formulari per editar el grup."
+msgstr "Utilitza el formulari per editar la vostra aplicació."
#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
msgid "Name is required."
-msgstr "Igual a la contrasenya de dalt. Requerit."
+msgstr "Cal un nom."
#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
msgid "Name is too long (max 255 chars)."
-msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
+msgstr "El nom és massa llarg (màx. 255 caràcters)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
-msgstr "Aquest sobrenom ja existeix. Prova un altre. "
+msgstr "El nom ja es troba en ús. Proveu-ne un altre."
#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
msgid "Description is required."
-msgstr "Descripció"
+msgstr "Cal una descripció."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "L'URL font és massa llarg."
#: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Source URL is not valid."
@@ -1270,7 +1288,7 @@ msgstr "La URL d'origen no és vàlida."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "Cal una organització."
#: actions/editapplication.php:206 actions/newapplication.php:191
msgid "Organization is too long (max 255 chars)."
@@ -1278,35 +1296,33 @@ msgstr "El camp organització és massa llarg (màx. 255 caràcters)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "Cal una pàgina d'inici de l'organització."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
-msgstr ""
+msgstr "La crida de retorn és massa llarga."
#: actions/editapplication.php:225 actions/newapplication.php:215
msgid "Callback URL is not valid."
-msgstr ""
+msgstr "L'URL de la crida de retorn no és vàlid."
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "No s'ha pogut actualitzar el grup."
+msgstr "No s'ha pogut actualitzar l'aplicació."
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
-msgstr "Editar el grup %s"
+msgstr "Edita el grup %s"
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
-msgstr "Has d'haver entrat per crear un grup."
+msgstr "Heu d'haver iniciat una sessió per crear un grup."
#: actions/editgroup.php:107 actions/editgroup.php:172
#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "Has de ser admin per editar aquest grup"
+msgstr "Heu de ser administrador per editar el grup."
#: actions/editgroup.php:158
msgid "Use this form to edit the group."
@@ -1336,16 +1352,15 @@ msgstr "Configuració guardada."
#. TRANS: Title for e-mail settings.
#: actions/emailsettings.php:61
-#, fuzzy
msgid "Email settings"
-msgstr "Configuració del correu electrònic"
+msgstr "Paràmetres del correu electrònic"
#. TRANS: E-mail settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr "Gestionar com reps correus de %%site.name%%."
+msgstr "Gestioneu com rebeu correu de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
@@ -1366,10 +1381,9 @@ msgstr "Adreça electrònica confirmada actualment."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
-msgstr "Suprimeix"
+msgstr "Elimina"
#: actions/emailsettings.php:122
msgid ""
@@ -1385,7 +1399,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel·la"
@@ -1400,7 +1413,6 @@ msgstr "Adreça electrònica, com ara «nomusuari@example.org»"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Afegeix"
@@ -1415,41 +1427,36 @@ msgstr "Correu electrònic entrant"
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
-msgstr ""
-"Envia correu electrònic a aquesta adreça per publicar noves notificacions."
+msgstr "Envia correu electrònic a aquesta adreça per publicar nous avisos."
#. TRANS: Instructions for incoming e-mail address input form.
#. TRANS: Instructions for incoming SMS e-mail address input form.
#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
+msgstr "Estableix una nova adreça electrònica d'enviament; cancel·la l'antiga."
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nou"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferències"
+msgstr "Preferències del correu electrònic"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
-msgstr ""
-"Envia'm notificacions quan algú nou se'm subscrigui, al meu correu "
-"electrònic."
+msgstr "Envia'm avisos per correu electrònic quan algú nou se'm subscrigui."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-"Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit."
+"Envia'm un correu electrònic quan algú afegeixi un avís meu com a preferit."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:193
@@ -1458,9 +1465,8 @@ msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:199
-#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
+msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:205
@@ -1470,7 +1476,7 @@ msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:212
msgid "I want to post notices by email."
-msgstr "Vull publicar notificacions per correu electrònic."
+msgstr "Vull publicar avisos amb el correu electrònic."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:219
@@ -1479,9 +1485,8 @@ msgstr "Publica una MicroID per al meu correu electrònic."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "S'han desat les preferències de disseny."
+msgstr "S'han desat les preferències del correu electrònic."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1494,7 +1499,7 @@ msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar l'adreça electrònica."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
@@ -1533,19 +1538,17 @@ msgstr ""
#: actions/emailsettings.php:419 actions/imsettings.php:383
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
-msgstr "Cap confirmació pendent per a cancel·lar."
+msgstr "Cap confirmació pendent per cancel·lar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
+msgstr "Aquesta l'adreça de correu electrònic incorrecta."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmació cancel·lada."
+msgstr "S'ha cancel·lat la confirmació de correu electrònic."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1555,9 +1558,8 @@ msgstr "Aquest no és el teu correu electrònic"
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "L'adreça ha estat eliminada."
+msgstr "S'ha eliminat l'adreça de correu electrònic."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1582,35 +1584,39 @@ msgstr "Nou correu electrònic entrant afegit."
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr "Aquesta nota ja és favorita."
+msgstr "Aquest avís ja és un preferit."
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
-msgstr "Desfavoritar favorit"
+msgstr "Fes que deixi de ser preferit"
#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
-msgstr "Notificacions populars"
+msgstr "Avisos populars"
#: actions/favorited.php:67
#, php-format
msgid "Popular notices, page %d"
-msgstr "Notificacions populars, pàgina %d"
+msgstr "Avisos populars, pàgina %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "Les notificacions més populars en aquest lloc ara mateix."
+msgstr "Els avisos més populars en aquest lloc ara mateix."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
+"Els avisos de preferits apareixen en aquesta pàgina però ningú n'ha preferit "
+"cap encara."
#: actions/favorited.php:153
msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr ""
+"Sigueu el primer en afegir un avís dels vostres preferits fent clic al botó "
+"de preferit que es troba al costat dels avisos que us poden agradar."
#: actions/favorited.php:156
#, php-format
@@ -1618,17 +1624,19 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
+"Per què no [registreu un compte](%%action.register%%) i sou el primer en "
+"afegir un avís als vostres preferits!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr "%s's notes favorites"
+msgstr "Avisos preferits de %s"
#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "Actualitzacions de %1$s a %2$s!"
+msgstr "Actualitzacions preferides per %1$s a %2$s!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
@@ -1641,7 +1649,7 @@ msgid "Featured users, page %d"
msgstr "Usuaris destacats, pàgina %d"
#: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
msgid "A selection of some great users on %s"
msgstr "Una selecció d'alguns dels millors usuaris a %s"
@@ -1671,7 +1679,7 @@ msgstr "L'usuari que s'escolta no existeix."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr "Pots utilitzar la subscripció local!"
+msgstr "Podeu utilitzar la subscripció local!"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
@@ -1682,19 +1690,16 @@ msgid "You are not authorized."
msgstr "No esteu autoritzat."
#: actions/finishremotesubscribe.php:113
-#, fuzzy
msgid "Could not convert request token to access token."
-msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
+msgstr "No s'ha pogut convertir el testimoni de sol·licitud a un d'accés."
#: actions/finishremotesubscribe.php:118
-#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Versió desconeguda del protocol OMB."
+msgstr "El servei remot utilitza una versió desconeguda del protocol OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Error en actualitzar el perfil remot"
+msgstr "S'ha produït un error en actualitzar el perfil remot."
#: actions/getfile.php:79
msgid "No such file."
@@ -1710,27 +1715,25 @@ msgstr "Rol no vàlid."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Aquest rol està reservat i no pot definir-se."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "No pots enviar un missatge a aquest usuari."
+msgstr "No podeu establir rols d'usuari en aquest lloc."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "L'usuari ja està silenciat."
+msgstr "L'usuari ja té aquest rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
-msgstr "No s'ha especificat perfil."
+msgstr "No s'ha especificat cap perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No hi ha cap perfil amb aquesta ID."
@@ -1744,9 +1747,8 @@ msgid "Only an admin can block group members."
msgstr "Només un administrador pot blocar membres del grup."
#: actions/groupblock.php:95
-#, fuzzy
msgid "User is already blocked from group."
-msgstr "Un usuari t'ha bloquejat."
+msgstr "L'usuari ja està blocat del grup."
#: actions/groupblock.php:100
msgid "User is not a member of group."
@@ -1757,14 +1759,14 @@ msgid "Block user from group"
msgstr "Bloca l'usuari del grup"
#: actions/groupblock.php:160
-#, fuzzy, php-format
+#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
-"Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del "
-"grup, i no podran enviar-hi res ni subscriure-s'hi en el futur."
+"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? S'eliminarà del "
+"grup, i no podrà enviar-hi res ni subscriure-s'hi en el futur."
#. TRANS: Submit button title for 'No' when blocking a user from a group.
#: actions/groupblock.php:182
@@ -1781,9 +1783,8 @@ msgid "Database error blocking user from group."
msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
#: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
msgid "No ID."
-msgstr "No ID"
+msgstr "Sense ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
@@ -1815,10 +1816,12 @@ msgid "Group logo"
msgstr "Logo del grup"
#: actions/grouplogo.php:153
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Pots pujar una imatge de logo per al grup."
+msgstr ""
+"Podeu pujar una imatge com a logotip del vostre grup. La mida màxima del "
+"fitxer és %s."
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
@@ -1838,9 +1841,9 @@ msgid "%s group members"
msgstr "%s membre/s en el grup"
#: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "%s membre/s en el grup, pàgina %d"
+msgstr "%1$s membres del grup, pàgina %2$d"
#: actions/groupmembers.php:118
msgid "A list of the users in this group."
@@ -1870,7 +1873,7 @@ msgstr "Fes l'usuari administrador"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s línia temporal"
@@ -1900,19 +1903,24 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Els grups de %%%%site.name%%%% us permeten trobar-vos i parlar amb gent "
+"d'interessos semblants. Després d'unir-vos a un grup, podeu enviar missatges "
+"a altres membres emprant la sintaxi «!groupname». No veieu cap grup que us "
+"agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne "
+"un de propi!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
msgstr "Crea un grup nou"
#: actions/groupsearch.php:52
-#, fuzzy, php-format
+#, php-format
msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
-"de cerca amb espais; han de ser majors a 3 caràcters."
+"Cerca grups a %%site.name%% per nom, ubicació o descripció. Separeu els "
+"termes de cerca amb espais; han de contenir com a mínim 3 caràcters."
#: actions/groupsearch.php:58
msgid "Group search"
@@ -1929,6 +1937,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Si no podeu trobar el grup que cerqueu, podeu provar de [crear-lo](%%action."
+"newgroup%%) també."
#: actions/groupsearch.php:85
#, php-format
@@ -1936,6 +1946,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Per què no [registreu un compte](%%action.register%%) i proveu de [crear-hi "
+"un grup](%%action.newgroup%%)!"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
@@ -1947,7 +1959,7 @@ msgstr "L'usuari no està blocat del grup."
#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
-msgstr "S'ha produït un error en suprimir el bloc."
+msgstr "S'ha produït un error en eliminar el bloc."
#. TRANS: Title for instance messaging settings.
#: actions/imsettings.php:60
@@ -1963,8 +1975,8 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
-"GTalk. Configura la teva adreça i opcions a sota."
+"Podeu enviar i rebre avisos a través de [missatges instantanis](%%doc.im%%) "
+"de Jabber/GTalk. Configureu la vostra adreça i opcions a continuació."
#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
#: actions/imsettings.php:94
@@ -2001,15 +2013,14 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Adreça Jabber o GTalk, per exemple \"NomUsuari@example.org\". Primer, "
-"assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
-"missatgeria instantània o a GTalk."
+"Adreça Jabber o GTalk, per exemple «NomUsuari@example.org». Primer, assegureu-"
+"vos d'afegir %s a la vostra llista d'amics en el vostre client de "
+"missatgeria instantània o al GTalk."
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferències"
+msgstr "Preferències de MI"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2072,7 +2083,7 @@ msgid ""
"s for sending messages to you."
msgstr ""
"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
-"has afegit. Has d'acceptar que %s et pugui enviar missatges."
+"heu afegit. Heu d'acceptar que %s us pugui enviar missatges."
#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
#: actions/imsettings.php:388
@@ -2081,15 +2092,13 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
+msgstr "No s'ha pogut eliminar la confirmació de MI."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmació cancel·lada."
+msgstr "S'ha cancel·lat la confirmació de MI."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2099,19 +2108,18 @@ msgstr "Aquest no és el teu Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "L'adreça ha estat eliminada."
+msgstr "S'ha eliminat l'adreça de MI."
#: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr "Safata d'entrada per %s"
+msgstr "Safata d'entrada de %1$s - pàgina %2$d"
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
-msgstr "Safata d'entrada per %s"
+msgstr "Safata d'entrada de %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
@@ -2124,11 +2132,10 @@ msgid "Invites have been disabled."
msgstr "S'han inhabilitat les invitacions."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr ""
-"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo "
-"%s"
+"Heu d'haver iniciat una sessió per convidar altres usuaris a utilitzar %s"
#: actions/invite.php:72
#, php-format
@@ -2137,11 +2144,11 @@ msgstr "Correu electrònic invàlid: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
-msgstr "Invitació(ons) enviada(des)"
+msgstr "Invitacions envidades"
#: actions/invite.php:112
msgid "Invite new users"
-msgstr "Invitar nous usuaris"
+msgstr "Convida nous usuaris"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
@@ -2181,11 +2188,11 @@ msgstr ""
#: actions/invite.php:187
msgid "Email addresses"
-msgstr "Direcció de correu electrònic"
+msgstr "Adreces de correu electrònic"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
-msgstr "Direccions d'amic per convidar (una per línia)"
+msgstr "Adreces d'amics per convidar (una per línia)"
#: actions/invite.php:192
msgid "Personal message"
@@ -2203,9 +2210,9 @@ msgstr "Envia"
#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
#: actions/invite.php:228
-#, fuzzy, php-format
+#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s"
+msgstr "%1$s us ha convidat a unir-vos al grup %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
@@ -2267,7 +2274,7 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr "Has d'haver entrat per participar en un grup."
+msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup."
#: actions/joingroup.php:88 actions/leavegroup.php:88
msgid "No nickname or ID."
@@ -2282,7 +2289,7 @@ msgstr "%1$s s'ha unit al grup %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr "Has d'haver entrat per a poder marxar d'un grup."
+msgstr "Heu d'haver iniciat una sessió per deixar un grup."
#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
@@ -2291,95 +2298,96 @@ msgstr "No ets membre d'aquest grup."
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s ha abandonat el grup %s"
+msgstr "%1$s ha abandonat el grup %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ja estàs connectat."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
-#: actions/login.php:132 actions/otp.php:120
-#, fuzzy
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
-msgstr "No autoritzat."
+msgstr ""
+"S'ha produït un error en definir l'usuari. Probablement no hi esteu "
+"autoritzat."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
+"Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
"compartits!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Contrasenya oblidada o perduda?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-"Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
-"contrasenya abans de canviar la teva configuració."
+"Per raons de seguretat, torneu a escriure el vostre nom d'usuari i "
+"contrasenya abans de canviar la vostra configuració."
+
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
-#: actions/login.php:270
-#, fuzzy, php-format
+#: actions/login.php:295
+#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no "
-"tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
-"[OpenID] (%%action.openidlogin%%)."
+"No teniu cap nom d'usuari encara? [Registreu-hi](%%action.register%%) un nou "
+"compte."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Només un administrador poc fer a un altre usuari administrador."
#: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s ja és un administrador del grup «%s»."
+msgstr "%1$s ja és un administrador del grup «%2$s»."
#: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
+msgstr "No s'ha pogut obtenir el registre de pertinència de %1$s al grup %2$s."
#: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "No es pot fer %s un administrador del grup %s"
+msgstr "No es pot fer %1$s administrador del grup %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "No té cap estatus ara mateix"
+msgstr "No hi ha cap estat actual."
#: actions/newapplication.php:52
msgid "New Application"
msgstr "Nova Aplicació"
#: actions/newapplication.php:64
-#, fuzzy
msgid "You must be logged in to register an application."
-msgstr "Has d'haver entrat per crear un grup."
+msgstr "Heu d'haver iniciat una sessió per registrar-hi una aplicació."
#: actions/newapplication.php:143
msgid "Use this form to register a new application."
@@ -2390,9 +2398,8 @@ msgid "Source URL is required."
msgstr "URL d'origen requerida."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "No s'han pogut crear els àlies."
+msgstr "No s'ha pogut crear l'aplicació."
#: actions/newgroup.php:53
msgid "New group"
@@ -2443,7 +2450,7 @@ msgstr "Nou avís"
#: actions/newnotice.php:217
msgid "Notice posted"
-msgstr "Notificació publicada"
+msgstr "S'ha publicat l'avís"
#: actions/noticesearch.php:68
#, php-format
@@ -2469,6 +2476,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -2476,6 +2485,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Per què no [registreu un compte](%%%%action.register%%%%) i sou el primer "
+"[en parlar del tema](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2504,9 +2515,8 @@ msgid "Nudge sent!"
msgstr "Reclamació enviada!"
#: actions/oauthappssettings.php:59
-#, fuzzy
msgid "You must be logged in to list your applications."
-msgstr "Heu d'iniciar una sessió per editar un grup."
+msgstr "Heu d'haver iniciat una sessió per llistar les vostres aplicacions."
#: actions/oauthappssettings.php:74
msgid "OAuth applications"
@@ -2514,20 +2524,20 @@ msgstr "Aplicacions OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Aplicacions que heu registrat"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "No teniu cap aplicació registrada encara."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Aplicacions connectades"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "Heu permès les aplicacions següents accedir al vostre compte."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2536,41 +2546,42 @@ msgstr "No sou usuari de l'aplicació."
#: actions/oauthconnectionssettings.php:186
#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr ""
+msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "No heu autoritzat cap aplicació perquè utilitzi el vostre compte."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
+"Els desenvolupadors poden editar els paràmetres de registre de llurs "
+"aplicacions "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Avís sense perfil"
+msgstr "L'avís no té cap perfil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "estat de %1$s a %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "tipus de contingut "
+msgstr "El tipus de contingut %s no està permès."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Si us plau, només URL %s sobre HTTP pla."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2580,7 +2591,7 @@ msgstr "Cerca de gent"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr "Cerca de notificacions"
+msgstr "Cerca d'avisos"
#: actions/othersettings.php:60
msgid "Other settings"
@@ -2588,7 +2599,7 @@ msgstr "Altres paràmetres"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr "Gestionar altres vàries opcions."
+msgstr "Gestiona altres opcions diferents."
#: actions/othersettings.php:108
msgid " (free service)"
@@ -2620,29 +2631,25 @@ msgid "No user ID specified."
msgstr "No s'ha especificat cap ID d'usuari."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "No s'ha especificat perfil."
+msgstr "No s'ha especificat cap testimoni d'inici de sessió."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "No id en el perfil sol·licitat."
+msgstr "No s'ha sol·licitat cap testimoni d'inici de sessió."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "El contingut de l'avís és invàlid"
+msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Accedir al lloc"
+msgstr "El testimoni d'inici de sessió ha vençut."
#: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
msgid "Outbox for %1$s - page %2$d"
-msgstr "Safata de sortida per %s"
+msgstr "Safata de sortida de %1$s - pàgina %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2657,11 +2664,11 @@ msgstr ""
#: actions/passwordsettings.php:58
msgid "Change password"
-msgstr "Canviar contrasenya"
+msgstr "Canvia la contrasenya"
#: actions/passwordsettings.php:69
msgid "Change your password."
-msgstr "Canviar contrasenya"
+msgstr "Canvieu la vostra contrasenya"
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
@@ -2680,7 +2687,7 @@ msgid "6 or more characters"
msgstr "6 o més caràcters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2692,11 +2699,11 @@ msgstr "Igual a la contrasenya de dalt"
msgid "Change"
msgstr "Canviar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Les contrasenyes no coincideixen."
@@ -2706,48 +2713,48 @@ msgstr "Contrasenya antiga incorrecta"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
-msgstr "Error en guardar usuari; invàlid."
+msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
-msgstr "No es pot guardar la nova contrasenya."
+msgstr "No es pot desar la nova contrasenya."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Contrasenya guardada."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Camins"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Camí i paràmetres del servidor d'aquest lloc StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Aquesta pàgina no està disponible en "
+msgstr "No es pot llegir el directori de temes: %s"
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "No es pot escriure al directori de fons: %s"
+msgstr "No es pot escriure al directori d'avatars: %s"
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
msgstr "No es pot escriure al directori de fons: %s"
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Aquesta pàgina no està disponible en "
+msgstr "No es pot llegir el directori de les traduccions: %s"
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "El servidor SSL no és vàlid. La mida màxima és de 255 caràcters."
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
msgid "Site"
@@ -2771,19 +2778,19 @@ msgstr "Camí del lloc"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr ""
+msgstr "El camí a les traduccions"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
-msgstr ""
+msgstr "El camí del directori a les traduccions"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr ""
+msgstr "URL atractius"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2855,21 +2862,19 @@ msgstr "Utilitza l'SSL"
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "Quan utilitzar l'SSL"
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "SSL server"
msgstr "Servidor SSL"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Servidor on dirigir les sol·licituds SSL"
#: actions/pathsadminpanel.php:352
-#, fuzzy
msgid "Save paths"
-msgstr "Avís del lloc"
+msgstr "Desa els camins"
#: actions/peoplesearch.php:52
#, php-format
@@ -2885,24 +2890,25 @@ msgid "People search"
msgstr "Cerca de gent"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Etiqueta no vàlida per a la gent: %s"
+msgstr "No és una etiqueta de gent vàlida: %s"
#: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
+msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "El contingut de l'avís és invàlid"
+msgstr "El contingut de l'avís no és vàlid."
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
+"La llicència ‘%1$s’ de l'avís no és compatible amb la llicència ‘%2$s’ del "
+"lloc."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2912,8 +2918,8 @@ msgstr "Configuració del perfil"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"Pots actualitzar la informació del teu perfil personal per a que la gent "
-"sàpiga més sobre tu."
+"Podeu actualitzar la informació del vostre perfil personal perquè la gent us "
+"pugui conèixer millor."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2924,50 +2930,49 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pàgina personal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL del teu web, blog o perfil en un altre lloc"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descriviu qui sou i els vostres interessos en %d caràcters"
-#: actions/profilesettings.php:125 actions/register.php:464
-#, fuzzy
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
-msgstr "Explica'ns alguna cosa sobre tu "
+msgstr "Feu una descripció personal i interessos"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicació"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
+msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Comparteix la meva ubicació actual en enviar avisos"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2979,33 +2984,33 @@ msgstr "Etiquetes"
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
-"por espais"
+"Etiquetes pròpies (lletres, nombres, -, ., i _), per comes o separades amb "
+"espais"
#: actions/profilesettings.php:151
msgid "Language"
-msgstr "Idioma"
+msgstr "Llengua"
#: actions/profilesettings.php:152
msgid "Preferred language"
-msgstr "Preferència d'idioma"
+msgstr "Llengua preferida"
#: actions/profilesettings.php:161
msgid "Timezone"
-msgstr "Franja horària"
+msgstr "Fus horari"
#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
-msgstr "Quina franja horària seria normal ser?"
+msgstr "En quin fus horari us trobeu normalment?"
#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal "
-"per no-humans)"
+"Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-"
+"humans)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia és massa llarga (màx. %d caràcters)."
@@ -3021,7 +3026,7 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)."
#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta no vàlida: \"%s\""
+msgstr "L'etiqueta no és vàlida: «%s»"
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
@@ -3033,11 +3038,11 @@ msgstr "No s'han pogut desar les preferències d'ubicació."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
-msgstr "No s'ha pogut guardar el perfil."
+msgstr "No s'ha pogut desar el perfil."
#: actions/profilesettings.php:383
msgid "Couldn't save tags."
-msgstr "No s'han pogut guardar les etiquetes."
+msgstr "No s'han pogut desar les etiquetes."
#. TRANS: Message after successful saving of administrative settings.
#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
@@ -3045,7 +3050,7 @@ msgid "Settings saved."
msgstr "Configuració guardada."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
msgstr "Més enllà del límit de la pàgina (%s)"
@@ -3103,16 +3108,20 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Això és %%site.name%%, un servei de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basat en l'eina lliure [StatusNet](http://status.net/). "
+"[Uniu-vos-hi ara](%%action.register%%) per compartir què feu amb els vostres "
+"amics, familiars, i companys! ([Més informació](%%doc.help%%))"
#: actions/public.php:247
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
"Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
-"wiki/Microblogging) "
+"wiki/Microblogging) basat en l'eina lliure [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -3127,6 +3136,8 @@ msgstr "Aquestes són les etiquetes recents més populars a %s "
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
+"Ningú ha enviat encara cap avís amb una [etiqueta de coixinet (#)](%%doc.tags"
+"%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -3138,6 +3149,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
+"escriure'n un!"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
@@ -3199,15 +3212,15 @@ msgstr ""
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
-msgstr "Recuperar"
+msgstr "Recupera"
#: actions/recoverpassword.php:208
msgid "Reset password"
-msgstr "Restablir contrasenya"
+msgstr "Reinicialitza la contrasenya"
#: actions/recoverpassword.php:209
msgid "Recover password"
-msgstr "Recuperar contrasenya"
+msgstr "Recupera la contrasenya"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
@@ -3235,7 +3248,7 @@ msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
+msgstr "No hi ha cap adreça de correu electrònic registrada d'aquest usuari."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
@@ -3246,7 +3259,7 @@ msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-"S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
+"S'han enviat instruccions per recuperar la vostra contrasenya a l'adreça de "
"correu electrònic registrada."
#: actions/recoverpassword.php:357
@@ -3261,7 +3274,7 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters."
msgid "Password and confirmation do not match."
msgstr "La contrasenya i la confirmació no coincideixen."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
@@ -3269,40 +3282,39 @@ msgstr "Error en configurar l'usuari."
msgid "New password successfully saved. You are now logged in."
msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "El codi d'invitació no és vàlid."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registre no permès."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "L'adreça de correu electrònic ja existeix."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nom d'usuari o contrasenya invàlids."
-#: actions/register.php:343
-#, fuzzy
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3310,45 +3322,69 @@ msgstr ""
"Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
"enllaçar a amics i col·legues. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o més caràcters. Requerit."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correu electrònic"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
+"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
-msgstr "Nom llarg, preferiblement el teu nom \"real\""
+msgstr "Nom llarg, preferiblement el vostre nom «real»"
+
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Entenc que el contingut i les dades de %1$s són privades i confidencials."
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "El meu text i els meus fitxers són copyright de %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Tots els drets reservats."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"excepte les següents dades privades: contrasenya, adreça de correu "
-"electrònic, adreça de missatgeria instantània, número de telèfon."
+"El meu text i fitxers es troben disponibles sota %s, excepte pel que fa a "
+"les dades privades: contrasenya, adreça de correu electrònic, adreça de "
+"missatgeria instantània i número de telèfon."
-#: actions/register.php:542
-#, fuzzy, php-format
+#: actions/register.php:583
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -3365,20 +3401,22 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, podries...\n"
+"Enhorabona, %1$s! Us donem la benvinguda a %%%%site.name%%%%. A partir "
+"d'ara, podríeu voler...\n"
"\n"
-"* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n"
-"* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder "
-"publicar les notificacions a través de missatgeria instantània.\n"
-"* [Buscar gent](%%%%action.peoplesearch%%%%) que puguis conèixer o que "
-"comparteixi els teus interessos. \n"
-"* Actualitzar les [preferències del teu perfil](%%%%action.profilesettings%%%"
-"%) per explicar als demés més sobre tu. * Llegir els [documents de la xarxa]"
-"(%%%%doc.help%%%%) per conèixer les característiques del nostre servei. \n"
+"* Anar al [vostre perfil](%2%s) i enviar el vostre primer missatge.\n"
+"* Afegir una [adreça de Jabber/GTalk](%%%%action.imsettings%%%%) i així "
+"poder enviar avisos a través de missatgeria instantània.\n"
+"* [Cercar gent](%%%%action.peoplesearch%%%%) que pugueu conèixer o que "
+"comparteixi els vostres interessos. \n"
+"* Actualitzar les [preferències del vostre perfil](%%%%action.profilesettings"
+"%%%%) per incloure-hi informació personal. \n"
+"* Consultar els [documents de la xarxa](%%%%doc.help%%%%) per tal de "
+"conèixer les característiques del servei. \n"
"\n"
-"Gràcies per registrar-te i esperem que gaudeixis d'aquest servei."
+"Gràcies per registrar-vos-hi i esperem que en gaudiu."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3393,10 +3431,10 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
-"Per a subscriure't, pots [iniciar una sessió](%%action.login%%), o "
-"[registrar](%%action.register%%) un nou compte. Si ja tens un en un [servei "
-"de microblogging compatible](%%doc.openmublog%%), escriu l'URL del teu "
-"perfil a sota."
+"Per subscriure-us, podeu [iniciar una sessió](%%action.login%%), o "
+"[registrar-hi](%%action.register%%) un nou compte. Si ja en teniu un en un "
+"[servei de microblogging compatible](%%doc.openmublog%%), escriviu l'URL del "
+"vostre perfil a continuació."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
@@ -3432,41 +3470,36 @@ msgid "Invalid profile URL (bad format)"
msgstr "L'URL del perfil és invàlid (format incorrecte)"
#: actions/remotesubscribe.php:168
-#, fuzzy
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "URL de perfil no vàlid (cap document YADIS)."
+msgstr ""
+"L'URL del perfil no és vàlid (no és un document YADIS o no s'ha definit un "
+"XRDS vàlid)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
-msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
+msgstr "Aquest és un perfil local! Inicieu una sessió per subscriure-us-hi."
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
-msgstr "No s'ha pogut obtenir un senyal de petició."
+msgstr "No s'ha pogut obtenir un testimoni de sol·licitud."
#: actions/repeat.php:57
-#, fuzzy
msgid "Only logged-in users can repeat notices."
-msgstr "Només l'usuari pot llegir les seves safates de correu."
+msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
msgid "No notice specified."
-msgstr "No s'ha especificat perfil."
+msgstr "No s'ha especificat cap avís."
#: actions/repeat.php:76
-#, fuzzy
msgid "You can't repeat your own notice."
-msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
+msgstr "No podeu repetir el vostre propi avís."
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "Ja heu blocat l'usuari."
+msgstr "Ja havíeu repetit l'avís."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetit"
@@ -3481,33 +3514,33 @@ msgid "Replies to %s"
msgstr "Respostes a %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "Respostes a %1$s el %2$s!"
+msgstr "Respostes a %1$s, pàgina %2$d"
#: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal de respostes de %s (RSS 1.0)"
#: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal de respostes de %s (RSS 2.0)"
#: actions/replies.php:159
#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal de respostes de %s (Atom)"
#: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
-"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res "
-"encara."
+"Aquesta és la línia temporal que mostra les respostes a %1$s, però %2$s "
+"encara no ha rebut cap avís a la seva atenció."
#: actions/replies.php:204
#, php-format
@@ -3515,6 +3548,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Podeu animar altres usuaris a una conversa, subscriviu-vos a més gent o "
+"[uniu-vos a grups](%%action.groups%%)."
#: actions/replies.php:206
#, php-format
@@ -3522,6 +3557,8 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+"Podeu provar d'[avisar %1$s](../%2$s) o [enviar quelcom per reclamar la seva "
+"atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -3529,40 +3566,34 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Respostes a %1$s el %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "No podeu silenciar els usuaris d'aquest lloc."
+msgstr "No podeu revocar els rols d'usuari en aquest lloc."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Usuari sense perfil coincident"
+msgstr "L'usuari no té aquest rol."
-#: actions/rsd.php:146 actions/version.php:157
-#, fuzzy
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
-msgstr "S'ha suprimit l'estat."
+msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "No pots enviar un missatge a aquest usuari."
+msgstr "No podeu posar els usuaris en un entorn de prova en aquest lloc."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Un usuari t'ha bloquejat."
+msgstr "L'usuari ja es troba en un entorn de proves."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
+msgstr "Paràmetres de sessió d'aquest lloc StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3570,7 +3601,7 @@ msgstr "Gestiona les sessions"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Si cal gestionar les sessions nosaltres mateixos."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
@@ -3586,34 +3617,31 @@ msgid "Save site settings"
msgstr "Desa els paràmetres del lloc"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "Has d'haver entrat per a poder marxar d'un grup."
+msgstr "Heu d'haver iniciat una sessió per visualitzar una aplicació."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Avís sense perfil"
+msgstr "Perfil de l'aplicació"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Icona"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nom"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
msgid "Organization"
-msgstr "Paginació"
+msgstr "Organització"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Descripció"
@@ -3626,56 +3654,57 @@ msgstr "Estadístiques"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Accions d'aplicació"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Reinicialitza la clau i la secreta"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Informació de l'aplicació"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Clau del consumidor"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Secreta del consumidor"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "Sol·licita l'URL del testimoni"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "Accedeix a l'URL del testimoni"
#: actions/showapplication.php:283
-#, fuzzy
msgid "Authorize URL"
-msgstr "Autoria"
+msgstr "Autoritza l'URL"
#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Nota: Les signatures HMAC-SHA1 són vàlides; però no es permet el mètode de "
+"signatures en text net."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "N'estàs segur que vols eliminar aquesta notificació?"
+msgstr ""
+"Esteu segur que voleu reinicialitzar la clau del consumidor i la secreta?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s's notes favorites"
+msgstr "Avisos preferits de %1$s, pàgina %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3684,23 +3713,25 @@ msgstr "No s'han pogut recuperar els avisos preferits."
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels preferits de %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels preferits de %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels preferits de %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"No heu triat cap avís preferit encara. Feu clic al botó de preferit dels "
+"avisos que us agraden per arxivar-los per a més endavant i fer-los conèixer."
#: actions/showfavorites.php:208
#, php-format
@@ -3708,6 +3739,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s no ha afegit cap avís als seus preferits encara. Envieu quelcom "
+"interessant que pugui afegir-hi."
#: actions/showfavorites.php:212
#, php-format
@@ -3716,6 +3749,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s no ha afegit cap avís als seus preferits encara. Per què no [registreu un "
+"compte](%%%%action.register%%%%) i llavors envieu quelcom interessant que "
+"pugui afegir-hi."
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
@@ -3727,9 +3763,9 @@ msgid "%s group"
msgstr "%s grup"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "%s membre/s en el grup, pàgina %d"
+msgstr "grup %1$s, pàgina %2$d"
#: actions/showgroup.php:227
msgid "Group profile"
@@ -3754,19 +3790,19 @@ msgid "Group actions"
msgstr "Accions del grup"
#: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Feed d'avisos del grup %s"
+msgstr "Canal d'avisos del grup %s (RSS 1.0)"
#: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Feed d'avisos del grup %s"
+msgstr "Canal d'avisos del grup %s (RSS 2.0)"
#: actions/showgroup.php:350
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Feed d'avisos del grup %s"
+msgstr "Canal d'avisos del grup %s (Atom)"
#: actions/showgroup.php:355
#, php-format
@@ -3800,9 +3836,15 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
+"(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure "
+"[StatusNet](http://status.net/). Els seus membres comparteixen missatges "
+"curts sobre llur vida i interessos. [Uniu-vos-hi ara](%%%%action.register%%%"
+"%) per formar part del grup i molt més! ([Més informació...](%%%%doc.help%%%"
+"%))"
#: actions/showgroup.php:469
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -3810,7 +3852,9 @@ msgid ""
"their life and interests. "
msgstr ""
"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
-"(http://ca.wikipedia.org/wiki/Microblogging)"
+"(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure "
+"[StatusNet](http://status.net/). Els seus membre comparteixen missatges "
+"curts sobre llur vida i interessos. "
#: actions/showgroup.php:497
msgid "Admins"
@@ -3835,57 +3879,57 @@ msgid "Message from %1$s on %2$s"
msgstr "Missatge de %1$s a %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Notificació publicada"
+msgstr "S'ha eliminat l'avís."
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Aviso etiquetats amb %s"
+msgstr " etiquetats amb %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%s perfils blocats, pàgina %d"
+msgstr "%1$s, pàgina %2$d"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Feed d'avisos del grup %s"
+msgstr "Canal d'avisos de %1$s etiquetats amb %2$s (RSS 1.0)"
#: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal d'avisos de %s (RSS 1.0)"
#: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal d'avisos de %s (RSS 2.0)"
#: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal d'avisos de %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Safata de sortida per %s"
+msgstr "FOAF de %s"
#: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res "
-"encara."
+"Aquesta és la línia temporal de %1$s, però %2$s no hi ha enviat res encara."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"Heu vist res interessant recentment? No heu enviat cap avís encara, ara "
+"podria ser un bon moment per començar :)"
#: actions/showstream.php:207
#, php-format
@@ -3893,6 +3937,8 @@ msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
+"Podeu provar d'avisar %1$s o [enviar quelcom per reclamar la seva atenció](%%"
+"%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3902,16 +3948,23 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
+"ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet]"
+"(http://status.net/). Els seus membres comparteixen missatges curts sobre "
+"llur vida i interessos. [Uniu-vos-hi ara](%%%%action.register%%%%) per poder "
+"seguir els avisos de **%s** i molt més! ([Més informació...](%%%%doc.help%%%"
+"%))"
#: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
-"ca.wikipedia.org/wiki/Microblogging) "
+"ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet]"
+"(http://status.net/). "
#: actions/showstream.php:305
#, php-format
@@ -3927,31 +3980,29 @@ msgid "User is already silenced."
msgstr "L'usuari ja està silenciat."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Paràmetres bàsic d'aquest lloc basat en l'StatusNet."
+msgstr "Paràmetres bàsics d'aquest lloc basat en l'StatusNet."
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
msgstr "El nom del lloc ha de tenir una longitud superior a zero."
#: actions/siteadminpanel.php:141
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "Heu de tenir una adreça electrònica de contacte vàlida"
+msgstr "Heu de tenir una adreça electrònica de contacte vàlida."
#: actions/siteadminpanel.php:159
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Llengua desconeguda «%s»"
+msgstr "Llengua desconeguda «%s»."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "El límit de text mínim és 0 (sense cap límit)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
-msgstr ""
+msgstr "El límit de duplicats ha de ser d'un o més segons."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -3967,7 +4018,7 @@ msgstr "El nom del vostre lloc, com ara «El microblog de l'empresa»"
#: actions/siteadminpanel.php:229
msgid "Brought by"
-msgstr ""
+msgstr "Funciona gràcies a"
#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
@@ -3975,11 +4026,11 @@ msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina"
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "URL de «Funciona gràcies a»"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "L'URL que s'utilitza en els enllaços de crèdits al peu de cada pàgina"
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
@@ -3998,13 +4049,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Fus horari per defecte del lloc; normalment UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Llengua per defecte del lloc"
+msgstr "Llengua per defecte"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Llengua del lloc quan la detecció automàtica des de la configuració del "
+"navegador no està disponible"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -4016,7 +4068,7 @@ msgstr "Límits del text"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Nombre màxim de caràcters dels avisos."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
@@ -4029,37 +4081,32 @@ msgstr ""
"de nou."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
msgstr "Avís del lloc"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Nou missatge"
+msgstr "Edita el missatge de tot el lloc"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+msgstr "No s'ha pogut desar l'avís del lloc."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "La mida màxima per als avisos de tot el lloc és de 255 caràcters."
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Avís del lloc"
+msgstr "Text de l'avís del lloc"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "Text d'avís de tot el lloc (màxim 255 caràcters, es permet l'HTML)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Avís del lloc"
+msgstr "Desa l'avís del lloc"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4082,9 +4129,8 @@ msgstr "L'SMS no és disponible."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Adreça de missatgeria instantània"
+msgstr "Adreça SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4094,7 +4140,7 @@ msgstr "Número de telèfon actualment confirmat i activat per SMS."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
-msgstr "Esperant confirmació per aquest número de telèfon."
+msgstr "S'està esperant la confirmació d'aquest número de telèfon."
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:142
@@ -4108,10 +4154,9 @@ msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
-msgstr "Confirmar"
+msgstr "Confirma"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
@@ -4125,9 +4170,8 @@ msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferències"
+msgstr "Preferències de l'SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4140,9 +4184,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "S'han desat les preferències."
+msgstr "S'han desat les preferències de l'SMS."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4166,14 +4209,13 @@ msgstr "Aquest número de telèfon pertany a un altre usuari."
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
#: actions/smssettings.php:384
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"S'ha enviat un codi de confirmació al número de telèfon has afegit. Revisa "
-"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
-"instruccions per utilitzar-lo."
+"S'ha enviat un codi de confirmació al número de telèfon que heu afegit. "
+"Comproveu el codi i instruccions del vostre telèfon per saber com fer-lo "
+"servir."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
@@ -4182,9 +4224,8 @@ msgstr "Aquest és un número de confirmació incorrecte."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmació cancel·lada."
+msgstr "La confirmació d'SMS s'ha cancel·lat."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4194,9 +4235,8 @@ msgstr "Aquest no és el teu número de telèfon."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Número de telèfon per als SMS"
+msgstr "S'ha eliminat el número de telèfon de l'SMS."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4216,41 +4256,40 @@ msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-"Capacitat per al teu telèfon mòbil. Si vostè coneix una companyia que "
-"accepti SMS a través del correu electrònic, però no està a la llista, "
-"envia'ns un correu electrònic per fer-nos-ho saber %s."
+"Capacitat per al vostre telèfon mòbil. Si coneixeu una companyia que accepti "
+"SMS a través del correu electrònic, però no es troba a la llista, envieu-nos "
+"un missatge de correu per fer-nos-ho saber %s."
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
#: actions/smssettings.php:548
msgid "No code entered"
-msgstr "No hi ha cap codi entrat"
+msgstr "No s'ha introduït cap codi"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Instantànies"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Canvia la configuració del lloc"
+msgstr "Gestiona la configuració de les instantànies"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "El valor d'execució d'instantànies no és vàlid."
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "La freqüència de les instantànies ha de ser un nombre."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "L'URL d'informe d'instantànies no és vàlid."
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
-msgstr ""
+msgstr "A l'atzar durant les sol·licituds web"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
@@ -4262,7 +4301,7 @@ msgstr "Instantànies de dades"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Quan enviar dades estadístiques als servidors de l'status.net"
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
@@ -4270,20 +4309,19 @@ msgstr "Freqüència"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Les instantànies s'enviaran una vegada cada N sol·licituds web"
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "Informa de l'URL"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
msgstr "Les instantànies s'enviaran a aquest URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Desa els paràmetres del lloc"
+msgstr "Desa els paràmetres de les instantànies"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
@@ -4295,17 +4333,15 @@ msgstr "No s'ha pogut guardar la subscripció."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Aquesta acció només accepta sol·licituds POST."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "No existeix el fitxer."
+msgstr "No existeix el perfil."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "No estàs subscrit a aquest perfil."
+msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4317,9 +4353,9 @@ msgid "%s subscribers"
msgstr "%s subscriptors"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s subscriptors, pàgina %d"
+msgstr "%1$s subscriptors, pàgina %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -4380,6 +4416,12 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"No esteu escoltant els avisos de ningú ara mateix, proveu de subscriure-us a "
+"gent que coneixeu. Proveu de [cercar gent](%%action.peoplesearch%%), trobar "
+"membres de grups en què esteu interessats i en els nostres [usuaris "
+"destacats](%%action.featured%%). Si sou un [usuari del Twitter](%%action."
+"twittersettings%%), podeu subscriure-us automàticament a gent que ja seguiu "
+"allà."
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
@@ -4395,29 +4437,28 @@ msgid "SMS"
msgstr "SMS"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
+msgstr "Avisos etiquetats amb %1$s, pàgina %2$d"
#: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal d'avisos de l'etiqueta %s (RSS 1.0)"
#: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal d'avisos de l'etiqueta %s (RSS 2.0)"
#: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed d'avisos de %s"
+msgstr "Canal d'avisos de l'etiqueta %s (Atom)"
#: actions/tagother.php:39
-#, fuzzy
msgid "No ID argument."
-msgstr "No argument de la id."
+msgstr "No hi ha cap argument ID."
#: actions/tagother.php:65
#, php-format
@@ -4442,15 +4483,15 @@ msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
-"Etiquetes per aquest usuari (lletres, números,, -, ., i _), comes o separat "
-"per espais"
+"Etiquetes d'aquest usuari (lletres, nombres,, -, ., i _), comes o separades "
+"amb espais"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
-"Només pots etiquetar gent a la que estiguis subscrit o que s'hagin subscrit "
-"a tu."
+"Només podeu etiquetar gent a la qual estigueu subscrit o que us hagin "
+"subscrit."
#: actions/tagother.php:200
msgid "Could not save tags."
@@ -4459,7 +4500,7 @@ msgstr "No s'han pogut guardar les etiquetes."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
-"Utilitza aquest formulari per afegir etiquetes als teus subscriptors i "
+"Utilitzeu aquest formulari per afegir etiquetes als vostres subscriptors i "
"subscripcions."
#: actions/tagrss.php:35
@@ -4475,18 +4516,16 @@ msgid "You haven't blocked that user."
msgstr "No heu blocat l'usuari."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "Un usuari t'ha bloquejat."
+msgstr "L'usuari no està a l'entorn de proves."
#: actions/unsilence.php:72
msgid "User is not silenced."
msgstr "L'usuari no està silenciat."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "No id en el perfil sol·licitat."
+msgstr "No hi ha cap identificador del perfil en la sol·licitud."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4497,30 +4536,32 @@ msgstr "No subscrit"
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
+"La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
+"llicència del lloc, «%2$s»."
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Usuari"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Paràmetres d'usuari d'aquest lloc StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric."
#: actions/useradminpanel.php:155
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
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+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
@@ -4546,7 +4587,7 @@ msgstr "Benvinguda als usuaris nous"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)."
#: actions/useradminpanel.php:241
msgid "Default subscription"
@@ -4566,24 +4607,23 @@ msgstr "S'han habilitat les invitacions"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Si es permet als usuaris invitar-ne de nous."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoritzar subscripció"
#: actions/userauthorization.php:110
-#, fuzzy
msgid ""
"Please check these details to make sure that you want to subscribe to this "
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Rejectâ€."
msgstr ""
-"Si us plau, revisa aquestes dades per a estar segur que desitges "
-"subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
-"avisos de ningú, clica \"Cancel·lar\"."
+"Si us plau, reviseu aquests detalls per assegurar-vos que voleu subscriure-"
+"us als avisos d'aquest usuari. Si no heu demanat subscriure-us als avisos de "
+"ningú, feu clic a «Rebutja»."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Llicència"
@@ -4594,7 +4634,7 @@ msgstr "Accepta"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "Subscriure's a aquest usuari"
+msgstr "Subscriu-me a aquest usuari"
#: actions/userauthorization.php:219
msgid "Reject"
@@ -4606,71 +4646,70 @@ msgstr "Rebutja la subscripció"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr "Cap petició d'autorització!"
+msgstr "No és una sol·licitud d'autorització!"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "Subscripció autoritzada"
#: actions/userauthorization.php:256
-#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-"S'ha autoritzat la subscripció, però no s'ha enviat un URL de retorn. "
-"Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
-"El teu identificador de subscripció és:"
+"S'ha autoritzat la subscripció, però no s'ha enviat cap URL de la crida de "
+"retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
+"com autoritzar la subscripció. El vostre testimoni de subscripció és:"
#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Subscripció rebutjada"
#: actions/userauthorization.php:268
-#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix "
-"de nou les instruccions per a saber com rebutjar la subscripció completament."
+"S'ha rebutjat la subscripció, però no s'ha enviat cap URL de la crida de "
+"retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
+"com rebutjar la subscripció completament."
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "No s'hi ha trobat l'URI de qui us escolta, «%s»."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "L'URI de qui escolteu, «%s», és massa llarga."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "L'URI de qui escolteu, «%s», és un usuari local."
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "L'URL del perfil «%s» és només per a un usuari local."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "L'URL de l'avatar «%s» no és vàlid."
#: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "No es pot llegir l'URL de l'avatar '%s'"
+msgstr "No es pot llegir l'URL de l'avatar «%s»."
#: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Tipus d'imatge incorrecte per a '%s'"
+msgstr "Tipus d'imatge incorrecta per a l'URL de l'avatar «%s»."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
@@ -4690,9 +4729,9 @@ msgstr "Gaudiu de l'entrepà!"
#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
#: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "%s membre/s en el grup, pàgina %d"
+msgstr "Grups de %1$s, pàgina %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
@@ -4706,114 +4745,124 @@ msgstr "%s no és membre de cap grup."
#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Proveu de [cercar grups](%%action.groupsearch%%) i unir-vos-hi."
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom group notice feed.
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Actualitzacions de %1$s a %2$s!"
-#: actions/version.php:73
-#, fuzzy, php-format
+#: actions/version.php:75
+#, php-format
msgid "StatusNet %s"
-msgstr "Estadístiques"
+msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
+"El lloc funciona gràcies a %1$s versió %2$s. Copyright 2008-2010 StatusNet, "
+"Inc. i col·laboradors."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Col·laboració"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"L'StatusNet és programari lliure; podeu redistribuir-lo i/o modificar-lo "
+"d'acord amb els termes de la llicència GNU Affero General Public License tal "
+"i com la publica la Free Software Foundation; tant per a la versió 3 de la "
+"llicència, com (a la vostra discreció) per a una versió posterior. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Aquest programa es distribueix amb la voluntat que sigui útil, perquè sense "
+"cap mena de garantia; sense tampoc cap garantia implícita respecte a la seva "
+"comercialització o idoneïtat per a cap propòsit en particular. Consulteu la "
+"llicència GNU Affero General Public License per a més detalls. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Hauríeu d'haver rebut una còpia de la llicència GNU Affero General Public "
+"License juntament amb el programa. Si no és així, consulteu %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Connectors"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
-#, fuzzy
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
-msgstr "Sessions"
+msgstr "Versió"
-#: actions/version.php:197
-#, fuzzy
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autoria"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Cap fitxer pot ser major de %d bytes i el fitxer que heu enviat era de %d "
+"bytes. Proveu de pujar una versió de mida menor."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
+"Un fitxer d'aquesta mida excediria la vostra quota d'usuari de %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+"Un fitxer d'aquesta mida excediria la vostra quota mensual de %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Perfil del grup"
+msgstr "No s'ha pogut unir al grup."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "No s'ha pogut actualitzar el grup."
+msgstr "No s'és part del grup."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Perfil del grup"
+msgstr "La sortida del grup ha fallat."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "No s'ha pogut actualitzar el grup."
+msgstr "No s'ha pogut actualitzar el grup local."
#: classes/Login_token.php:76
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "No s'han pogut crear els àlies."
+msgstr "No s'ha pogut crear un testimoni d'inici de sessió per a %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4828,55 +4877,53 @@ msgid "Could not update message with new URI."
msgstr "No s'ha pogut inserir el missatge amb la nova URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr "Hashtag de l'error de la base de dades:%s"
+msgstr ""
+"S'ha produït un error de la base de dades en inserir una etiqueta de "
+"coixinet (%): %s"
-#: classes/Notice.php:245
-#, fuzzy
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
-msgstr "Problema en guardar l'avís."
+msgstr "S'ha produït un problema en desar l'avís. És massa llarg."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
-msgstr "Problema al guardar la notificació. Usuari desconegut."
+msgstr "S'ha produït un problema en desar l'avís. Usuari desconegut."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
-"minuts."
+"Massa avisos massa ràpid; pren un respir i publica de nou en uns minuts."
-#: classes/Notice.php:260
-#, fuzzy
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
-"minuts."
+"Massa missatges duplicats en massa poc temps; preneu un respir i torneu a "
+"enviar en uns minuts."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
-msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
+msgstr "Ha estat bandejat de publicar avisos en aquest lloc."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:965
-#, fuzzy
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
-msgstr "Problema en guardar l'avís."
+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:1513
-#, fuzzy, php-format
+#: classes/Notice.php:1564
+#, php-format
msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
@@ -4891,19 +4938,16 @@ msgid "User has blocked you."
msgstr "Un usuari t'ha bloquejat."
#: classes/Subscription.php:167
-#, fuzzy
msgid "Not subscribed!"
-msgstr "No estàs subscrit!"
+msgstr "No hi esteu subscrit!"
#: classes/Subscription.php:173
-#, fuzzy
msgid "Couldn't delete self-subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
+msgstr "No s'ha pogut eliminar l'autosubscripció."
#: classes/Subscription.php:200
-#, fuzzy
msgid "Couldn't delete subscription OMB token."
-msgstr "No s'ha pogut eliminar la subscripció."
+msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
@@ -4919,18 +4963,16 @@ msgid "Could not create group."
msgstr "No s'ha pogut crear el grup."
#: classes/User_group.php:489
-#, fuzzy
msgid "Could not set group URI."
-msgstr "No s'ha pogut establir la pertinença d'aquest grup."
+msgstr "No es pot definir l'URI del grup."
#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "No s'ha pogut establir la pertinença d'aquest grup."
#: classes/User_group.php:524
-#, fuzzy
msgid "Could not save local group info."
-msgstr "No s'ha pogut guardar la subscripció."
+msgstr "No s'ha pogut desar la informació del grup local."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
@@ -4954,9 +4996,8 @@ msgstr "Canvieu la gestió del correu"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
-#, fuzzy
msgid "Design your profile"
-msgstr "Perfil de l'usuari"
+msgstr "Dissenyeu el vostre perfil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
@@ -4970,9 +5011,9 @@ msgstr "Altres"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:145
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
#: lib/action.php:161
@@ -4980,206 +5021,189 @@ msgid "Untitled page"
msgstr "Pàgina sense titol"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
-#, fuzzy
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
+msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr "No s'ha pogut redirigir al servidor: %s"
+msgstr "Connecta als serveis"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Connexió"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
-#, fuzzy
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
-#, fuzzy
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
-msgstr "Admin"
+msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
-#, fuzzy, php-format
+#: lib/action.php:465
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convidar amics i companys perquè participin a %s"
+msgstr "Convida amics i coneguts perquè participin a %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
-#, fuzzy
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Convida"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
-#, fuzzy
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
-#, fuzzy
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Finalitza la sessió"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un compte"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
-#, fuzzy
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registre"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
-#, fuzzy
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:481
-#, fuzzy
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Inici de sessió"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
-#, fuzzy
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
-msgstr "Ajuda'm"
+msgstr "Ajuda'm!"
-#: lib/action.php:487
-#, fuzzy
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
-#, fuzzy
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:493
-#, fuzzy
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Cerca"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Avís del lloc"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Vistes locals"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
-msgstr "Notificació pàgina"
+msgstr "Avís de pàgina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Quant a"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Preguntes més freqüents"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
-msgstr ""
+msgstr "Termes del servei"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privadesa"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Font"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contacte"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Insígnia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5188,13 +5212,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** és un servei de microblogging."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5206,68 +5230,75 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "El contingut i les dades de %1$s són privades i confidencials."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
+"El contingut i les dades són copyright de %1$s. Tots els drets reservats."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"El contingut i les dades són copyright dels col·laboradors. Tots els drets "
+"reservats."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+"Tot el contingut i les dades de %1$s es troben disponibles sota una "
+"llicència %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Anteriors"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"S'esperava un element del canal arrel, però se n'ha obtingut tot un document "
+"XML sencer."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "No es pot gestionar el contingut remot encara."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "No es pot gestionar el contingut XML incrustat encara."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "No es pot gestionar el contingut Base64 incrustat encara."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
@@ -5276,177 +5307,165 @@ msgstr "No podeu fer canvis al lloc."
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "Registre no permès."
+msgstr "No es permeten canvis a aquell tauler."
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Comanda encara no implementada."
+msgstr "El showForm() no està implementat."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Comanda encara no implementada."
+msgstr "El saveSettings() no està implementat."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
#: lib/adminpanelaction.php:284
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+msgstr "No s'ha pogut eliminar el paràmetre de disseny."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configuració bàsica del lloc"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
-#, fuzzy
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Lloc"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configuració del disseny"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
-#, fuzzy
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Disseny"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
-#, fuzzy
+#: lib/adminpanelaction.php:366
msgid "User configuration"
-msgstr "Configuració dels camins"
+msgstr "Configuració de l'usuari"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuari"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
-#, fuzzy
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
-msgstr "Configuració del disseny"
+msgstr "Configuració de l'accés"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configuració dels camins"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
-#, fuzzy
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
-msgstr "Configuració del disseny"
+msgstr "Configuració de les sessions"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
-#, fuzzy
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
-msgstr "Avís del lloc"
+msgstr "Edita l'avís del lloc"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
-#, fuzzy
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
-msgstr "Configuració dels camins"
+msgstr "Configuració de les instantànies"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"El recurs API requereix accés de lectura i d'escriptura, però només en teniu "
+"de lectura."
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "Edita l'aplicació"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Icona de l'aplicació"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d characters"
-msgstr "Descriu el grup amb 140 caràcters"
+msgstr "Descriviu la vostra aplicació en %d caràcters"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
-#, fuzzy
msgid "Describe your application"
-msgstr "Descriu el grup amb 140 caràcters"
+msgstr "Descriviu la vostra aplicació"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
-#, fuzzy
msgid "URL of the homepage of this application"
-msgstr "URL del teu web, blog del grup u tema"
+msgstr "URL de la pàgina d'inici de l'aplicació"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
-#, fuzzy
msgid "Source URL"
-msgstr "Font"
+msgstr "URL d'origen"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organització responsable de l'aplicació"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
-#, fuzzy
msgid "URL for the homepage of the organization"
-msgstr "URL del teu web, blog del grup u tema"
+msgstr "L'URL de la pàgina d'inici de l'organització"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL on redirigir-hi després de l'autenticació."
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Navegador"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "Escriptori"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipus d'aplicació, navegador o escriptori"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "Només lectura"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "Lectura i escriptura"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
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:359
@@ -5456,25 +5475,24 @@ msgstr "Cancel·la"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "de lectura i d'escriptura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "només de lectura"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprovat: %1$s - accés «%2$s»."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Suprimeix"
+msgstr "Revoca"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5493,20 +5511,19 @@ msgstr "Proveïdor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Avisos on apareix l'adjunt"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
msgstr "Etiquetes de l'adjunció"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "El canvi de contrasenya ha fallat"
-#: lib/authenticationplugin.php:235
-#, fuzzy
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
-msgstr "Contrasenya canviada."
+msgstr "No es permet el canvi de contrasenya"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
@@ -5521,9 +5538,8 @@ msgid "Command failed"
msgstr "Comanda fallida"
#: lib/command.php:83 lib/command.php:105
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "No hi ha cap perfil amb aquesta id."
+msgstr "No existeix cap avís amb aquest identificador."
#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
@@ -5532,16 +5548,16 @@ msgstr "L'usuari no té última nota"
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
#: lib/command.php:127
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
+msgstr "No s'ha pogut trobar un usuari amb el sobrenom %s"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
+msgstr "No s'ha pogut trobar a un usuari local amb el sobrenom %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
@@ -5549,14 +5565,14 @@ msgstr "Perdona, aquesta comanda no està implementada."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "No té massa sentit avisar-se a un mateix!"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
#: lib/command.php:234
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Reclamació enviada"
+msgstr "S'ha enviat un avís a %s"
#: lib/command.php:260
#, php-format
@@ -5565,10 +5581,13 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Subscripcions: %1$s\n"
+"Subscriptors: %2$s\n"
+"Avisos: %3$s"
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr "Nota marcada com a favorita."
+msgstr "L'avís està marcat com a preferit."
#: lib/command.php:323
msgid "You are already a member of that group"
@@ -5584,9 +5603,9 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s."
+msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5596,14 +5615,14 @@ msgstr "Nom complet: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localització: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pàgina web: %s"
@@ -5612,7 +5631,7 @@ msgstr "Pàgina web: %s"
#: lib/command.php:430
#, php-format
msgid "About: %s"
-msgstr "Sobre tu: %s"
+msgstr "Informació personal: %s"
#: lib/command.php:457
#, php-format
@@ -5620,51 +5639,51 @@ msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
+"%s és un perfil remot; només podeu enviar missatges directess a usuaris del "
+"mateix servidor."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+msgstr ""
+"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
-msgstr "Missatge directe per a %s enviat"
+msgstr "Missatge directe a %s enviat"
#: lib/command.php:494
msgid "Error sending direct message."
-msgstr "Error al enviar el missatge directe."
+msgstr "S'ha produït un error en enviar el missatge directe."
#: lib/command.php:514
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "No es poden posar en on les notificacions."
+msgstr "No es pot repetir el vostre propi avís"
#: lib/command.php:519
-#, fuzzy
msgid "Already repeated that notice"
-msgstr "Eliminar aquesta nota"
+msgstr "Ja s'ha repetit l'avís"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
#: lib/command.php:529
-#, fuzzy, php-format
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Notificació publicada"
+msgstr "S'ha repetit l'avís de %s"
#: lib/command.php:531
-#, fuzzy
msgid "Error repeating notice."
-msgstr "Problema en guardar l'avís."
+msgstr "S'ha produït un error en repetir l'avís."
#: lib/command.php:562
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+msgstr "L'avís és massa llarg - el màxim és %d caràcters, i n'heu enviat %d"
#: lib/command.php:571
#, php-format
@@ -5672,18 +5691,16 @@ msgid "Reply to %s sent"
msgstr "S'ha enviat la resposta a %s"
#: lib/command.php:573
-#, fuzzy
msgid "Error saving notice."
-msgstr "Problema en guardar l'avís."
+msgstr "S'ha produït un error en desar l'avís."
#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
-msgstr "Especifica el nom de l'usuari a que vols subscriure't"
+msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us"
#: lib/command.php:628
-#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
-msgstr "No estàs subscrit a aquest perfil."
+msgstr "No es pot subscriure a perfils de OMB amb ordres."
#: lib/command.php:634
#, php-format
@@ -5692,12 +5709,12 @@ msgstr "Subscrit a %s"
#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
+msgstr "Especifiqueu el nom de l'usuari de qui voleu cancel·lar la subscripció"
#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
-msgstr "Has deixat d'estar subscrit a %s"
+msgstr "Heu cancel·lat la subscripció a %s"
#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
@@ -5705,38 +5722,39 @@ msgstr "Comanda encara no implementada."
#: lib/command.php:685
msgid "Notification off."
-msgstr "Notificacions off."
+msgstr "Avisos desactivats."
#: lib/command.php:687
msgid "Can't turn off notification."
-msgstr "No es poden posar en off les notificacions."
+msgstr "No es poden desactivar els avisos."
#: lib/command.php:708
msgid "Notification on."
-msgstr "Notificacions on."
+msgstr "Avisos activitats."
#: lib/command.php:710
msgid "Can't turn on notification."
-msgstr "No es poden posar en on les notificacions."
+msgstr "No es poden activar els avisos."
#: lib/command.php:723
msgid "Login command is disabled"
-msgstr ""
+msgstr "L'ordre d'inici de sessió està inhabilitada"
#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"L'enllaç només es pot fer servir una vegada, i només funciona durant 2 "
+"minuts: %s"
#: lib/command.php:761
-#, fuzzy, php-format
+#, php-format
msgid "Unsubscribed %s"
-msgstr "Has deixat d'estar subscrit a %s"
+msgstr "S'ha cancel·lat la subscripció de %s"
#: lib/command.php:778
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "No estàs subscrit a aquest perfil."
+msgstr "No esteu subscrit a ningú."
#: lib/command.php:780
msgid "You are subscribed to this person:"
@@ -5745,9 +5763,8 @@ msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
#: lib/command.php:800
-#, fuzzy
msgid "No one is subscribed to you."
-msgstr "No pots subscriure a un altre a tu mateix."
+msgstr "Ningú no us ha subscrit."
#: lib/command.php:802
msgid "This person is subscribed to you:"
@@ -5806,6 +5823,44 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Ordres:\n"
+"on - activeu els avisos\n"
+"off - desactiveu els avisos\n"
+"help - mostra aquesta ajuda\n"
+"follow <nickname> - se subscriu a l'usuari\n"
+"groups - llista els grups on us heu unit\n"
+"subscriptions - llista la gent que seguiu\n"
+"subscribers - llista la gent que us segueix\n"
+"leave <nickname> - cancel·la la subscripció de l'usuari\n"
+"d <nickname> <text> - missatge directe a l'usuari\n"
+"get <nickname> - s'obté el darrer avís de l'usuari\n"
+"whois <nickname> - s'obté la informació del perfil de l'usuari\n"
+"lose <nickname> - es força l'usuari a deixar de seguir-vos\n"
+"fav <nickname> - afegeix el darrer avís de l'usuari com a «preferit»\n"
+"fav #<notice_id> - afegeix l'avís amb l'id donat com a «preferit»\n"
+"repeat #<notice_id> - repeteix l'avís amb l'id donat\n"
+"repeat <nickname> - repeteix el darrer avís de l'usari\n"
+"reply #<notice_id> - respon l'avís amb l'id donat\n"
+"reply <nickname> - respon el darrer avís de l'usuari\n"
+"join <group> - s'uneix al grup\n"
+"login - s'obté un enllaç per iniciar una sessió des de la interfície web\n"
+"drop <group> - es deixa el grup\n"
+"stats - s'obté el vostre estat\n"
+"stop - el mateix que «off»\n"
+"quit - el mateix que «off»\n"
+"sub <nickname> - el mateix que «follow»\n"
+"unsub <nickname> - el mateix que «leave»\n"
+"last <nickname> - el mateix que «get»\n"
+"on <nickname> - no s'ha implementat encara.\n"
+"off <nickname> - no s'ha implementat encara.\n"
+"nudge <nickname> - es recorda a l'usuari que actualitzi.\n"
+"invite <phone number> - no s'ha implementat encara.\n"
+"track <word> - no s'ha implementat encara.\n"
+"untrack <word> - no s'ha implementat encara.\n"
+"track off - no s'ha implementat encara.\n"
+"untrack all - no s'ha implementat encara.\n"
+"tracks - no s'ha implementat encara.\n"
+"tracking - no s'ha implementat encara.\n"
#: lib/common.php:135
msgid "No configuration file found. "
@@ -5813,11 +5868,11 @@ msgstr "No s'ha trobat cap fitxer de configuració. "
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "S'han cercat fitxers de configuracions en els llocs següents: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
-msgstr "Podeu voler executar l'instal·lador per a corregir-ho."
+msgstr "Podeu voler executar l'instal·lador per corregir-ho."
#: lib/common.php:139
msgid "Go to the installer."
@@ -5825,11 +5880,11 @@ msgstr "Vés a l'instal·lador."
#: lib/connectsettingsaction.php:110
msgid "IM"
-msgstr "Missatgeria Instantània"
+msgstr "MI"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
-msgstr "Actualitzacions per Missatgeria Instantània"
+msgstr "Actualitzacions per missatgeria instantània (MI)"
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
@@ -5852,10 +5907,11 @@ msgid "Upload file"
msgstr "Puja un fitxer"
#: lib/designsettings.php:109
-#, fuzzy
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Pots pujar el teu avatar personal."
+msgstr ""
+"Podeu pujar la vostra imatge de fons personal. La mida màxima del fitxer és "
+"2MB."
#: lib/designsettings.php:418
msgid "Design defaults restored."
@@ -5863,11 +5919,11 @@ msgstr "S'han restaurat els paràmetres de disseny per defecte."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr "Deixar de tenir favorita aquesta notificació"
+msgstr "Deixa de tenir com a preferit aquest avís"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr "Fer favorita aquesta notificació"
+msgstr "Fes preferit aquest avís"
#: lib/favorform.php:140
msgid "Favor"
@@ -5911,7 +5967,7 @@ msgstr "Etiqueta"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr "Elegeix una etiqueta para reduir la llista"
+msgstr "Trieu una etiqueta per escurçar la llista"
#: lib/galleryaction.php:143
msgid "Go"
@@ -5920,31 +5976,31 @@ msgstr "Vés-hi"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Atorga a l'usuari el rol «%s»"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL del teu web, blog del grup u tema"
+msgstr "URL del teu web, blog del grup o de la temàtica"
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr "Descriviu el grup o el tema"
+msgstr "Descriviu el grup o la temàtica"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "Descriviu el grup o el tema en %d caràcters"
+msgstr "Descriviu el grup o la temàtica en %d caràcters"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
msgstr ""
-"Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\""
+"Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»"
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgstr "Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d"
#: lib/groupnav.php:85
msgid "Group"
@@ -5957,12 +6013,12 @@ msgstr "Blocat"
#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
-msgstr "%susuaris blocats"
+msgstr "%s usuaris blocats"
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr "Editar propietats del grup %s"
+msgstr "Edita les propietats del grup %s"
#: lib/groupnav.php:113
msgid "Logo"
@@ -5971,7 +6027,7 @@ msgstr "Logo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr "Afegir o editar logo %s"
+msgstr "Afegeix o edita el logo %s"
#: lib/groupnav.php:120
#, php-format
@@ -5989,7 +6045,7 @@ msgstr "Grups amb més entrades"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "Etiquetes en les notificacions del grup %s"
+msgstr "Etiquetes en els avisos del grup %s"
#. TRANS: Client exception 406
#: lib/htmloutputter.php:104
@@ -6001,9 +6057,9 @@ msgid "Unsupported image file format."
msgstr "Format d'imatge no suportat."
#: lib/imagefile.php:88
-#, fuzzy, php-format
+#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr "Pots pujar una imatge de logo per al grup."
+msgstr "La mida del fitxer és massa gran, La mida màxima és %s."
#: lib/imagefile.php:93
msgid "Partial upload."
@@ -6019,7 +6075,7 @@ msgstr "No és una imatge o és un fitxer corrupte."
#: lib/imagefile.php:122
msgid "Lost our file."
-msgstr "Hem perdut el nostre arxiu."
+msgstr "Hem perdut el nostre fitxer."
#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
@@ -6036,12 +6092,12 @@ msgstr "kB"
#: lib/jabber.php:387
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/jabber.php:567
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Llengua desconeguda «%s»"
+msgstr "Font %d de la safata d'entrada desconeguda."
#: lib/joinform.php:114
msgid "Join"
@@ -6049,7 +6105,7 @@ msgstr "Inici de sessió"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr "Abandonar"
+msgstr "Deixa"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
@@ -6057,7 +6113,7 @@ msgstr "Accedir amb el nom d'usuari i contrasenya"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr "Crear nou compte"
+msgstr "Registreu-vos-hi si voleu un compte nou"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
@@ -6081,6 +6137,19 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Hola, %s.\n"
+"\n"
+"Algú ha introduït aquesta adreça electrònica a %s.\n"
+"\n"
+"Si sou qui ho ha fet i voleu confirmar-hi la vostra entrada, feu servir "
+"l'URL a continuació:\n"
+"\n"
+"\t%s\n"
+"\n"
+"Si nou, simplement ignoreu el missatge.\n"
+"\n"
+"Gràcies pel vostre temps, \n"
+"%s\n"
#. TRANS: Subject of new-subscriber notification e-mail
#: lib/mail.php:243
@@ -6088,9 +6157,19 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ara està escoltant els teus avisos a %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Si creieu que el compte s'està fent servir de forma abusiva, podeu blocar-lo "
+"de la llista dels vostres subscriptors i notificar-lo com a brossa als "
+"administradors del lloc a %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
-#, fuzzy, php-format
+#: lib/mail.php:254
+#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
"\n"
@@ -6103,29 +6182,31 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
-"%1$s ara està escoltant els teus avisos a %2$s.\n"
+"%1$s ara està escoltant els vostres avisos a %2$s.\n"
"\n"
-"\t%3$s\n"
+"%3$s\n"
"\n"
+"%4$s%5$s%6$s\n"
"Atentament,\n"
-"%4$s.\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Canvieu la vostra adreça electrònica o les opcions d'avís a %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
-#, fuzzy, php-format
+#: lib/mail.php:274
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Biografia: %s\n"
-"\n"
+msgstr "Biografia: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nou correu electrònic per publicar a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6137,40 +6218,40 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
-"Tens una nova direcció per publicar a %1$s.\n"
+"Teniu una nova adreça per publicar a %1$s.\n"
"\n"
-"Envia un correu electrònic a %2$s per publicar un nou missatge.\n"
+"Envieu un correu electrònic a %2$s per publicar un nou missatge.\n"
"\n"
"Més instruccions per al correu electrònic a %3$s.\n"
"\n"
-"Sincerament teus,\n"
+"Atentament,\n"
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s estat"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmació SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Esperant confirmació per aquest número de telèfon."
+msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Has estat reclamat per %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6185,15 +6266,25 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) què tal us trobeu is us convida a publicar algunes notícies.\n"
+"\n"
+"Esperem sentir-vos aviat :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"No responeu aquest missatge; no els hi arribarà.\n"
+"\n"
+"Ben cordialment,\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nou missatge privat de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6211,15 +6302,29 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) us ha enviat un missatge privat:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Podeu respondre llurs missatges a continuació:\n"
+"\n"
+"%4$s\n"
+"\n"
+"No responeu aquest missatge; no els hi arribarà.\n"
+"\n"
+"Ben cordialment,\n"
+"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
-#, fuzzy, php-format
+#: lib/mail.php:589
+#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s ha afegit la teva nota com a favorita"
+msgstr "%s (@%s) ha afegit el vostre avís com a preferit"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6239,23 +6344,42 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) acaba d'afegir el vostre avís de %2$s com a preferit.\n"
+"\n"
+"L'URL del vostre avís és:\n"
+"\n"
+"%3$s\n"
+"\n"
+"El text del vostre avís és:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Podeu veure la llista dels preferits de %1$s a continuació:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Atentament,\n"
+"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"La conversa sencera pot llegir-se a continuació:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) us ha enviat un avís a la vostra atenció"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6281,6 +6405,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"1$s (@%9$s) acaba d'enviar un avís un avís a la vostra atenció (una resposta "
+"amb @) a %2$s.\n"
+"\n"
+"L'avís és a continuació:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Hi diu:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$s Podeu respondre'l a continuació:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"Teniu la llista de les respostes amb @ a continuació:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Atentament,\n"
+"%2$s\n"
+"\n"
+"P.S. Podeu desactivar els avisos per correu aquí: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6291,8 +6438,11 @@ msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"No teniu missatges privats. Podeu enviar un missatge per animar altres "
+"usuaris en la conversa. La gent pot enviar-vos missatges només per als "
+"vostres ulls."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "de"
@@ -6313,27 +6463,33 @@ msgid "Sorry, no incoming email allowed."
msgstr "Ho sentim, no s'hi permet correu d'entrada."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Format d'imatge no suportat."
+msgstr "Tipus de missatge no permès: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"S'ha produït un error a la base de dades mentre es desava el vostre fitxer. "
+"Torneu-ho a provar."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
+"El fitxer pujat excedeix la mida de la directiva upload_max_filesize del php."
+"ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"El fitxer pujat excedeix la mida de la directiva MAX_FILE_SIZE especificada "
+"en el formulari HTML."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "El fitxer pujat només s'ha pujat parcialment."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
@@ -6341,38 +6497,37 @@ msgstr "Manca una carpeta temporal."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "No s'ha pogut escriure el fitxer al disc."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "L'extensió ha aturat la càrrega del fitxer."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "El fitxer excedeix la quota de l'usuari."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "No s'ha pogut moure el fitxer al directori de destinació."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "No s'ha pogut recuperar la conversa pública."
+msgstr "No s'ha pogut determinar el tipus MIME del fitxer."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr "Proveu d'emprar un altre format %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "%s no és un tipus de fitxer permès al servidor."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr "Enviar notificació directa"
+msgstr "Envia un avís directe"
#: lib/messageform.php:146
msgid "To"
@@ -6383,14 +6538,13 @@ msgid "Available characters"
msgstr "Caràcters disponibles"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Envia"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "Enviar notificació"
+msgstr "Envia un avís"
#: lib/noticeform.php:173
#, php-format
@@ -6406,71 +6560,69 @@ msgid "Attach a file"
msgstr "Adjunta un fitxer"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Comparteix la vostra ubicació"
+msgstr "Comparteix la meva ubicació"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Comparteix la vostra ubicació"
+msgstr "No comparteixis la meva ubicació"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Ho sentim, la obtenció de la vostra ubicació geogràfica està trigant més de "
+"l'esperat; torneu-ho a provar més tard"
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
-#, fuzzy
msgid "N"
-msgstr "No"
+msgstr "N"
#. TRANS: Used in coordinates as abbreviation of south
#: lib/noticelist.php:432
msgid "S"
-msgstr ""
+msgstr "S"
#. TRANS: Used in coordinates as abbreviation of east
#: lib/noticelist.php:434
msgid "E"
-msgstr ""
+msgstr "E"
#. TRANS: Used in coordinates as abbreviation of west
#: lib/noticelist.php:436
msgid "W"
-msgstr ""
+msgstr "O"
#: lib/noticelist.php:438
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
#: lib/noticelist.php:447
msgid "at"
-msgstr ""
+msgstr "a"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "en context"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetit per"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "respondre a aquesta nota"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Respon"
-#: lib/noticelist.php:674
-#, fuzzy
+#: lib/noticelist.php:666
msgid "Notice repeated"
-msgstr "Notificació publicada"
+msgstr "Avís repetit"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -6501,9 +6653,8 @@ msgid "Error inserting remote profile"
msgstr "Error en inserir perfil remot"
#: lib/oauthstore.php:345
-#, fuzzy
msgid "Duplicate notice"
-msgstr "Eliminar nota."
+msgstr "Duplica l'avís"
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
@@ -6540,12 +6691,11 @@ msgstr "Els teus missatges enviats"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr "Etiquetes en les notificacions de %s's"
+msgstr "Etiquetes en els avisos de %s"
-#: lib/plugin.php:114
-#, fuzzy
+#: lib/plugin.php:115
msgid "Unknown"
-msgstr "Acció desconeguda"
+msgstr "Desconegut"
#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -6574,13 +6724,13 @@ msgstr "Membre des de"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Mitjana diària"
#: lib/profileaction.php:264
msgid "All groups"
msgstr "Tots els grups"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Mètode no implementat"
@@ -6604,15 +6754,13 @@ msgstr "Destacat"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
-#, fuzzy
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
-msgstr "No argument de la id."
+msgstr "No hi ha arguments de retorn."
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "Repeteix l'avís"
+msgstr "Voleu repetir l'avís?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6623,23 +6771,21 @@ msgid "Repeat this notice"
msgstr "Repeteix l'avís"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Bloca l'usuari del grup"
+msgstr "Revoca el rol «%s» de l'usuari"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Safata d'entrada"
+msgstr "Entorn de proves"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Desbloquejar aquest usuari"
+msgstr "Posa l'usuari a l'entorn de proves"
#: lib/searchaction.php:120
msgid "Search site"
@@ -6663,15 +6809,15 @@ msgstr "Gent"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr "Trobar gent en aquest lloc"
+msgstr "Cerca gent en aquest lloc"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr "Trobar contingut de les notes"
+msgstr "Cerca el contingut dels avisos"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr "Trobar un grup en aquest lloc"
+msgstr "Cerca grups en aquest lloc"
#: lib/section.php:89
msgid "Untitled section"
@@ -6679,7 +6825,7 @@ msgstr "Secció sense títol"
#: lib/section.php:106
msgid "More..."
-msgstr "Més…"
+msgstr "Més..."
#: lib/silenceform.php:67
msgid "Silence"
@@ -6697,7 +6843,7 @@ msgstr "Persones %s subscrites a"
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr "Persones subscrites a %s"
+msgstr "Gent subscrita a %s"
#: lib/subgroupnav.php:99
#, php-format
@@ -6711,34 +6857,78 @@ msgstr "Convida"
#: lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convidar amics i companys perquè participin a %s"
+msgstr "Convida amics i companys perquè participin a %s"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Núvol d'etiquetes personals (etiquetes pròpies)"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Núvol d'etiquetes personals"
#: lib/tagcloudsection.php:56
msgid "None"
msgstr "Cap"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr "El servidor no pot gestionar la pujada de temes si no pot tractar ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "La pujada del tema ha fallat o no hi és."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Ha fallat el desament del tema."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "El tema no és vàlid: l'estructura del directori no és correcta"
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"El tema pujat és massa gran; ha de tenir menys de %d bytes descomprimit."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "L'arxiu del tema no és vàlid: manca el fitxer de css / display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"El tema conté un fitxer o un nom de carpeta que no és vàlida. Feu servir "
+"només lletres ASCII, dígits, caràcters de subratllat i el símbol de menys."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "El tema conté un tipus de fitxer «.%s», que no està permès."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "S'ha produït un error en obrir l'arxiu del tema."
+
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr "Que més publiquen"
+msgstr "Qui més publica"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Treu de l'entorn de proves"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Desbloquejar aquest usuari"
+msgstr "Treu l'usuari de l'entorn de proves"
#: lib/unsilenceform.php:67
msgid "Unsilence"
@@ -6750,16 +6940,16 @@ msgstr "Dessilencia l'usuari"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr "Deixar d'estar subscrit des d'aquest usuari"
+msgstr "Cancel·la la subscripció d'aquest usuari"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr "Cancel·lar subscripció"
+msgstr "Cancel·la la subscripció"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "L'usuari no té perfil."
+msgstr "L'usuari %s (%d) no té un registre de perfil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6771,7 +6961,7 @@ msgstr "Accions de l'usuari"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "S'està eliminant l'usuari..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
@@ -6783,7 +6973,7 @@ msgstr "Edita"
#: lib/userprofile.php:287
msgid "Send a direct message to this user"
-msgstr "Enviar un missatge directe a aquest usuari"
+msgstr "Envia un missatge directe a aquest usuari"
#: lib/userprofile.php:288
msgid "Message"
@@ -6794,73 +6984,70 @@ msgid "Moderate"
msgstr "Modera"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "Perfil de l'usuari"
+msgstr "Rol de l'usuari"
#: lib/userprofile.php:366
-#, fuzzy
msgctxt "role"
msgid "Administrator"
-msgstr "Administradors"
+msgstr "Administrador"
#: lib/userprofile.php:367
-#, fuzzy
msgctxt "role"
msgid "Moderator"
-msgstr "Modera"
+msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fa pocs segons"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fa un minut"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fa una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fa un dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fa un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "fa un any"
@@ -6875,6 +7062,7 @@ 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."
#: lib/xmppmanager.php:403
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+msgstr ""
+"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index b4efa9433..f9bd7ded9 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:21+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:06+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Přijmout"
@@ -91,25 +91,25 @@ msgid "Save"
msgstr "Uložit"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Žádné takové oznámení."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -122,7 +122,7 @@ msgid "No such user."
msgstr "Žádný takový uživatel."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s a přátelé"
@@ -130,39 +130,39 @@ msgstr "%s a přátelé"
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s a přátelé"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed přítel uživatele: %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed přítel uživatele: %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed přítel uživatele: %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -170,14 +170,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,66 +185,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s a přátelé"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Potvrzující kód nebyl nalezen"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Nelze aktualizovat uživatele"
@@ -266,7 +266,7 @@ msgstr "Nelze uložit profil"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -325,42 +325,42 @@ msgstr ""
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr ""
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Toto je již vaše Jabber"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Nelze smazat oblíbenou položku."
@@ -397,122 +397,122 @@ msgstr "Nelze aktualizovat uživatele"
msgid "Could not find target user."
msgstr "Nelze aktualizovat uživatele"
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "PÅ™ezdívka může obsahovat pouze malá písmena a Äísla bez mezer"
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou"
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Není platnou přezdívkou."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Stránka není platnou URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Neplatná adresa '%s'"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou"
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Žádný požadavek nebyl nalezen!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "Již jste přihlášen"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Nelze přesměrovat na server: %s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "Neodeslal jste nám profil"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Nelze vytvořit OpenID z: %s"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "Profil"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Neodeslal jste nám profil"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr ""
@@ -528,15 +528,15 @@ msgstr "Neplatná velikost"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -600,13 +600,13 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
#, fuzzy
msgid "Account"
msgstr "O nás"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -614,8 +614,8 @@ msgid "Nickname"
msgstr "Přezdívka"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Heslo"
@@ -632,11 +632,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -655,27 +655,27 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
msgid "Already repeated that notice."
msgstr "Odstranit toto oznámení"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "Obrázek nahrán"
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "Žádný požadavek nebyl nalezen!"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -685,32 +685,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Nepodporovaný formát obrázku."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1 statusů na %2"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Mikroblog od %s"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1 statusů na %2"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -725,12 +725,12 @@ msgstr "Odpovědi na %s"
msgid "Repeats of %s"
msgstr "Odpovědi na %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mikroblog od %s"
@@ -790,7 +790,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Odstranit"
@@ -832,12 +832,12 @@ msgstr "Avatar smazán."
msgid "You already blocked that user."
msgstr "Již jste přihlášen"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -849,7 +849,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -859,7 +859,7 @@ msgstr "Ne"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Žádný takový uživatel."
@@ -869,7 +869,7 @@ msgstr "Žádný takový uživatel."
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -878,11 +878,11 @@ msgid "Yes"
msgstr "Ano"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1017,7 +1017,7 @@ msgstr "Neodeslal jste nám profil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1051,7 +1051,7 @@ msgstr "Odstranit toto oznámení"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nepřihlášen"
@@ -1081,7 +1081,7 @@ msgid "Do not delete this notice"
msgstr "Žádné takové oznámení."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Odstranit toto oznámení"
@@ -1121,50 +1121,59 @@ msgstr "Vzhled"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Neplatná velikost"
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Změnit heslo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "Nové sdělení"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Změnit"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Nové sdělení"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Nové sdělení"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Pozadí"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1172,58 +1181,66 @@ msgid ""
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Změnit barvy"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Obsah"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Hledat"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Odkazy"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1233,7 +1250,7 @@ msgstr ""
msgid "Save"
msgstr "Uložit"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1519,7 +1536,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
@@ -1756,13 +1773,13 @@ msgstr "Uživatel nemá profil."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1906,7 +1923,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr ""
@@ -2303,50 +2320,54 @@ msgstr "Neodeslal jste nám profil"
msgid "%1$s left group %2$s"
msgstr "%1 statusů na %2"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Již přihlášen"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Zapamatuj si mÄ›"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "PříštÄ› automaticky pÅ™ihlásit; ne pro poÄítaÄe, které používá "
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ztracené nebo zapomenuté heslo?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "Z bezpeÄnostních důvodů, prosím zadejte znovu své jméno a heslo."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Neplatné jméno nebo heslo"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
"[Registrovat](%%action.register%%) nový úÄet, nebo vyzkouÅ¡ejte [OpenID](%%"
@@ -2548,31 +2569,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Sdělení nemá profil"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1 statusů na %2"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "Připojit"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2684,7 +2705,7 @@ msgid "6 or more characters"
msgstr "6 a více znaků"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Heslo znovu"
@@ -2696,11 +2717,11 @@ msgstr "Stejné jako heslo výše"
msgid "Change"
msgstr "Změnit"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hesla nesouhlasí"
@@ -2721,7 +2742,7 @@ msgid "Password saved."
msgstr "Heslo uloženo"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2936,43 +2957,43 @@ msgstr "Neznámý profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 znaků nebo Äísel, bez teÄek, Äárek a mezer"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Celé jméno"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Moje stránky"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Popiš sebe a své zájmy ve 140 znacích"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Popište sebe a své zájmy"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "O mÄ›"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Umístění"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Místo. Město, stát."
@@ -3012,7 +3033,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
@@ -3264,7 +3285,7 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé"
msgid "Password and confirmation do not match."
msgstr "Heslo a potvrzení nesouhlasí"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
@@ -3272,72 +3293,94 @@ msgstr "Chyba nastavení uživatele"
msgid "New password successfully saved. You are now logged in."
msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Chyba v ověřovacím kódu"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Emailová adresa již existuje"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3346,7 +3389,7 @@ msgstr ""
" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
"Äíslo."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3365,7 +3408,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3449,7 +3492,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
msgid "You already repeated that notice."
msgstr "Již jste přihlášen"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Vytvořit"
@@ -3521,7 +3564,7 @@ msgstr "Neodeslal jste nám profil"
msgid "User doesn't have this role."
msgstr "Uživatel nemá profil."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Obrázek nahrán"
@@ -3538,7 +3581,7 @@ msgstr "Uživatel nemá profil."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3583,7 +3626,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3596,7 +3639,7 @@ msgid "Organization"
msgstr "Umístění"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
@@ -4198,7 +4241,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4556,7 +4599,7 @@ msgstr ""
"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
"klikněte na \"Zrušit\""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licence"
@@ -4687,29 +4730,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Statistiky"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4717,7 +4760,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4725,40 +4768,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "Osobní"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4801,48 +4844,48 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:249
+#: classes/Notice.php:255
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problém při ukládání sdělení"
#. 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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4953,128 +4996,128 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Osobní"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Změnit heslo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Připojit"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Odběry"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Neplatná velikost"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Odhlásit"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "VytvoÅ™it nový úÄet"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registrovat"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Přihlásit"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomoci mi!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Nápověda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5082,74 +5125,74 @@ msgstr "Hledat"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Nápověda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "O nás"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Soukromí"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Zdroj"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5159,13 +5202,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** je služba mikroblogů."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5177,57 +5220,57 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
#, fuzzy
msgid "After"
msgstr "« Novější"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "Starší »"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5235,11 +5278,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5270,74 +5313,74 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Nové sdělení"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Vzhled"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Nové sdělení"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5472,12 +5515,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Heslo uloženo"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Heslo uloženo"
@@ -5572,14 +5615,14 @@ msgstr "Celé jméno"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6079,8 +6122,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1 od teÄ naslouchá tvým sdÄ›lením v %2"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6102,19 +6152,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "O mÄ›"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6128,30 +6178,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6168,13 +6218,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6194,13 +6244,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1 od teÄ naslouchá tvým sdÄ›lením v %2"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6222,7 +6272,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6230,13 +6280,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6273,7 +6323,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr " od "
@@ -6434,26 +6484,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Žádný obsah!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Vytvořit"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "odpovÄ›Ä"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Sdělení"
@@ -6528,7 +6578,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6565,7 +6615,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6590,7 +6640,7 @@ msgstr ""
msgid "Popular"
msgstr "Hledání lidí"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Žádný takový dokument."
@@ -6614,7 +6664,7 @@ msgstr "Odstranit toto oznámení"
msgid "Revoke the \"%s\" role from this user"
msgstr "Žádný takový uživatel."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6717,6 +6767,51 @@ msgstr ""
msgid "None"
msgstr ""
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Chyba systému při nahrávání souboru"
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Nahrávání obrázku selhalo."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Chyba při aktualizaci vzdáleného profilu"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6801,56 +6896,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "před pár sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "asi před minutou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "asi před hodinou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "asi přede dnem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "asi před měsícem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index f8a75b1a9..3f16402f2 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,12 +1,14 @@
# Translation of StatusNet to German
#
# Author@translatewiki.net: Bavatar
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Lutzgh
# Author@translatewiki.net: March
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Michael
# Author@translatewiki.net: Michi
# Author@translatewiki.net: Pill
+# Author@translatewiki.net: The Evil IP address
# Author@translatewiki.net: Umherirrender
# --
# This file is distributed under the same license as the StatusNet package.
@@ -15,12 +17,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:26+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:12+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -28,7 +30,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Zugang"
@@ -91,25 +93,24 @@ msgid "Save"
msgstr "Speichern"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "Seite nicht vorhanden"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -122,7 +123,7 @@ msgid "No such user."
msgstr "Unbekannter Benutzer."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s und Freunde, Seite% 2$d"
@@ -130,33 +131,33 @@ msgstr "%1$s und Freunde, Seite% 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s und Freunde"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed der Freunde von %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed der Freunde von %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed der Freunde von %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -164,7 +165,7 @@ msgstr ""
"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas "
"gepostet."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -174,7 +175,7 @@ msgstr ""
"poste selber etwas."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -184,7 +185,7 @@ msgstr ""
"posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit "
"zu erregen."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -195,64 +196,66 @@ msgstr ""
"erregen?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Du und Freunde"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-Methode nicht gefunden."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Diese Methode benötigt ein POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
+"Du musst einen Parameter mit Namen 'device' übergeben. Mögliche Werte sind: "
+"sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Konnte Benutzerdaten nicht aktualisieren."
@@ -272,7 +275,7 @@ msgstr "Konnte Profil nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -331,44 +334,44 @@ msgstr "Direkte Nachricht an %s"
msgid "All the direct messages sent to %s"
msgstr "Alle an %s gesendeten direkten Nachrichten"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Fehlender Nachrichtentext!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Empfänger nicht gefunden."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
"du nicht befreundet bist."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Keine Nachricht mit dieser ID gefunden."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Diese Nachricht ist bereits ein Favorit!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Konnte keinen Favoriten erstellen."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Diese Nachricht ist kein Favorit!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Konnte Favoriten nicht löschen."
@@ -401,123 +404,122 @@ msgstr "Konnte öffentlichen Stream nicht abrufen."
msgid "Could not find target user."
msgstr "Konnte keine Statusmeldungen finden."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
"Leerzeichen sind nicht erlaubt."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ungültiger Nutzername."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr ""
"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Ungültiges Stichwort: „%s“"
+msgstr "Ungültiges Alias: „%s“"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias kann nicht das gleiche wie der Spitznamen sein."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Gruppe nicht gefunden!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Du bist bereits Mitglied dieser Gruppe"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Der Admin dieser Gruppe hat dich gesperrt."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Du bist kein Mitglied dieser Gruppe."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s’s Gruppen"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#: actions/apigrouplist.php:108
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Gruppen in denen %s Mitglied ist"
+msgstr "%1$s Gruppen in denen %2$s Mitglied ist"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s Gruppen"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "Gruppen von %s"
@@ -532,15 +534,15 @@ msgstr "Ungültiges Token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -606,12 +608,12 @@ msgstr ""
"vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Profil"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +621,8 @@ msgid "Nickname"
msgstr "Nutzername"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passwort"
@@ -636,11 +638,11 @@ msgstr "Erlauben"
msgid "Allow or deny access to your account information."
msgstr "Zugang zu deinem Konto erlauben oder ablehnen"
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Diese Methode benötigt ein POST oder DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
@@ -657,26 +659,26 @@ msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
msgid "Already repeated that notice."
msgstr "Nachricht bereits wiederholt"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Status gelöscht."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Keine Nachricht mit dieser ID gefunden."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nicht gefunden."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -687,32 +689,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Bildformat wird nicht unterstützt."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoriten von %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Aktualisierungen erwähnen %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
+msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s öffentliche Zeitleiste"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Nachrichten von allen!"
@@ -727,12 +729,12 @@ msgstr "Antworten an %s"
msgid "Repeats of %s"
msgstr "Antworten von %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Nachrichten, die mit %s getagt sind"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualisierungen mit %1$s getagt auf %2$s!"
@@ -790,7 +792,7 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Löschen"
@@ -831,11 +833,11 @@ msgstr "Avatar gelöscht."
msgid "You already blocked that user."
msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Benutzer blockieren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -850,17 +852,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Nein"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Diesen Benutzer freigeben"
@@ -869,20 +870,19 @@ msgstr "Diesen Benutzer freigeben"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
@@ -928,9 +928,9 @@ msgstr "Diesen Benutzer freigeben"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Versenden an "
+msgstr "Versenden an %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -946,7 +946,7 @@ msgstr "Dieser Bestätigungscode ist nicht für dich!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
msgstr "Nicht erkannter Adresstyp %s"
@@ -1009,7 +1009,7 @@ msgstr "Du bist Besitzer dieses Programms"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1042,7 +1042,7 @@ msgstr "Programm löschen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nicht angemeldet."
@@ -1073,7 +1073,7 @@ msgid "Do not delete this notice"
msgstr "Diese Nachricht nicht löschen"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Nachricht löschen"
@@ -1113,45 +1113,54 @@ msgstr "Design"
msgid "Design settings for this StatusNet site."
msgstr "Design-Einstellungen für diese StatusNet-Website."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Ungültige URL für das Logo"
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
msgstr "Theme nicht verfügbar: %s"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Logo ändern"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Seitenlogo"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Theme ändern"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Seitentheme"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Theme dieser Seite."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Seitentheme"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Hintergrundbild ändern"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Hintergrund"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1161,57 +1170,65 @@ msgstr ""
"Dateigröße beträgt %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "An"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Aus"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Hintergrundbild ein- oder ausschalten."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Hintergrundbild kacheln"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Farben ändern"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Inhalt"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Seitenleiste"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Eigene CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standardeinstellungen benutzen"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standard-Design wiederherstellen"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standard wiederherstellen"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1221,7 +1238,7 @@ msgstr "Standard wiederherstellen"
msgid "Save"
msgstr "Speichern"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Design speichern"
@@ -1375,7 +1392,6 @@ msgstr "Aktuelle bestätigte E-Mail-Adresse."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Entfernen"
@@ -1394,7 +1410,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Abbrechen"
@@ -1409,7 +1424,6 @@ msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Hinzufügen"
@@ -1437,16 +1451,14 @@ msgstr ""
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Neu"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Einstellungen"
+msgstr "E-Mail Einstellungen"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1487,9 +1499,8 @@ msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Design-Einstellungen gespeichert."
+msgstr "E-Mail Einstellungen gespeichert."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1502,7 +1513,7 @@ msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
@@ -1545,15 +1556,13 @@ msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Das ist die falsche IM-Adresse."
+msgstr "Dies ist die falsche E-Mail Adresse"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+msgstr "E-Mail Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1563,9 +1572,8 @@ msgstr "Dies ist nicht deine E-Mail-Adresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Die Adresse wurde entfernt."
+msgstr "Die E-Mail Adresse wurde entfernt."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1704,9 +1712,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Service nutzt unbekannte OMB-Protokollversion."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Fehler beim Aktualisieren des entfernten Profils"
+msgstr "Fehler beim Aktualisieren des entfernten Profils."
#: actions/getfile.php:79
msgid "No such file."
@@ -1734,13 +1741,13 @@ msgstr "Nutzer hat diese Aufgabe bereits"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Kein Profil angegeben."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Kein Benutzer-Profil mit dieser ID."
@@ -1882,7 +1889,7 @@ msgstr "Diesen Benutzer zu einem Admin ernennen"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s Zeitleiste"
@@ -2029,9 +2036,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Einstellungen"
+msgstr "IM Einstellungen"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2103,15 +2109,13 @@ msgstr "Das ist die falsche IM-Adresse."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Konnte E-Mail-Bestätigung nicht löschen."
+msgstr "Konnte die IM Bestätigung nicht löschen."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+msgstr "IM Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2121,9 +2125,8 @@ msgstr "Dies ist nicht deine JabberID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Die Adresse wurde entfernt."
+msgstr "Die IM Adresse wurde entfernt."
#: actions/inbox.php:59
#, php-format
@@ -2146,7 +2149,7 @@ msgid "Invites have been disabled."
msgstr "Einladungen wurden deaktiviert."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
@@ -2318,40 +2321,40 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
msgid "%1$s left group %2$s"
msgstr "%1$s hat die Gruppe %2$s verlassen"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Bereits angemeldet."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Falscher Benutzername oder Passwort."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Anmelden"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Passwort vergessen?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2359,14 +2362,17 @@ msgstr ""
"Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
"ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Mit Nutzernamen und Passwort anmelden."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
-"[Registriere](%%action.register%%) ein neues Konto."
+"Du hast noch keinen Nutzernamen? [Registriere](%%action.register%%) ein "
+"neues Konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2388,9 +2394,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Konnte %1$s nicht zum Administrator der Gruppe %2$s machen"
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Kein aktueller Status"
+msgstr "Kein aktueller Status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2559,9 +2564,9 @@ msgid "You are not a user of that application."
msgstr "Du bist kein Benutzer dieses Programms."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Kann Zugang dieses Programm nicht entfernen: "
+msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2573,31 +2578,30 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
"Entwickler können die Registrierungseinstellungen ihrer Programme ändern "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Nachricht hat kein Profil"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s Status auf %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "Content-Typ "
+msgstr "Content-Typ %s wird nicht untersützt."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Bitte nur %s URLs über einfaches HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2635,7 +2639,7 @@ msgstr "Profil-Einstellungen ansehen"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr "Prifil-Designs anzeigen oder verstecken."
+msgstr "Profil-Designs anzeigen oder verstecken."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2701,7 +2705,7 @@ msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bestätigen"
@@ -2713,11 +2717,11 @@ msgstr "Gleiches Passwort wie zuvor"
msgid "Change"
msgstr "Ändern"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passwörter stimmen nicht überein."
@@ -2738,7 +2742,7 @@ msgid "Password saved."
msgstr "Passwort gespeichert."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Pfad"
@@ -2747,24 +2751,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Pfad- und Serverangaben für diese StatusNet Seite."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Theme-Verzeichnis nicht lesbar: %s"
+msgstr "Theme-Verzeichnis nicht lesbar: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s"
+msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s"
+msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Sprachverzeichnis nicht lesbar: %s"
+msgstr "Sprachverzeichnis nicht lesbar: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2905,9 +2909,9 @@ msgid "People search"
msgstr "Suche nach anderen Nutzern"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Ungültiger Personen-Tag: %s"
+msgstr "Ungültiger Personen-Tag: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2915,9 +2919,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Benutzer die sich selbst mit %1$s getagged haben - Seite %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Ungültiger Nachrichteninhalt"
+msgstr "Ungültiger Nachrichteninhalt."
#: actions/postnotice.php:101
#, php-format
@@ -2945,44 +2948,44 @@ msgstr "Profilinformation"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Vollständiger Name"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beschreibe dich selbst und deine Interessen in %d Zeichen"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beschreibe dich selbst und deine Interessen"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografie"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Aufenthaltsort"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
@@ -3026,7 +3029,7 @@ msgstr ""
"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
"Menschen)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. %d Zeichen)"
@@ -3066,9 +3069,9 @@ msgid "Settings saved."
msgstr "Einstellungen gespeichert."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Jenseits des Seitenlimits (%s)"
+msgstr "Jenseits des Seitenlimits (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3290,7 +3293,7 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten"
msgid "Password and confirmation do not match."
msgstr "Passwort und seine Bestätigung stimmen nicht überein."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Fehler bei den Nutzereinstellungen."
@@ -3298,88 +3301,110 @@ msgstr "Fehler bei den Nutzereinstellungen."
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Entschuldigung, ungültiger Bestätigungscode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrierung nicht gestattet"
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Diese E-Mail-Adresse existiert bereits."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
-#: actions/register.php:343
-#, fuzzy
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-"Hier kannst du einen neuen Zugang einrichten. Danach kannst du Nachrichten "
-"und Links an deine Freunde und Kollegen schicken. "
+"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
+"Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
"Pflicht."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 oder mehr Buchstaben. Pflicht."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-Mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Wird nur für Updates, wichtige Mitteilungen und zur "
"Passwortwiederherstellung verwendet"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längerer Name, bevorzugt dein „echter“ Name"
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Alle Rechte vorbehalten."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
-"Telefonnummer."
+"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und "
+"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3412,7 +3437,7 @@ msgstr ""
"\n"
"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3494,7 +3519,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
msgid "You already repeated that notice."
msgstr "Nachricht bereits wiederholt"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Wiederholt"
@@ -3569,7 +3594,7 @@ msgstr "Du kannst die Rollen von Nutzern dieser Seite nicht widerrufen."
msgid "User doesn't have this role."
msgstr "Benutzer verfügt nicht über diese Rolle."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3583,7 +3608,7 @@ msgstr "Benutzer ist schon blockiert."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sitzung"
@@ -3626,7 +3651,7 @@ msgid "Icon"
msgstr "Symbol"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Name"
@@ -3637,7 +3662,7 @@ msgid "Organization"
msgstr "Organisation"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Beschreibung"
@@ -3666,11 +3691,11 @@ msgstr "Programminformation"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Anwender Schlüssel"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Anwender Geheimnis"
#: actions/showapplication.php:273
msgid "Request token URL"
@@ -3735,6 +3760,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende du doch "
+"einfach eine interessante Nachricht, damit sich daran etwas ändert :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3994,7 +4021,6 @@ msgid "Minimum text limit is 0 (unlimited)."
msgstr "Minimale Textlänge ist 0 Zeichen (unbegrenzt)"
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
msgstr "Duplikatlimit muss mehr als 1 Sekunde sein"
@@ -4089,9 +4115,8 @@ msgid "Unable to save site notice."
msgstr "Konnte Seitenbenachrichtigung nicht speichern"
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen"
+msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -4124,9 +4149,8 @@ msgstr "SMS ist nicht verfügbar."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM-Adresse"
+msgstr "SMS Adresse"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4150,7 +4174,6 @@ msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Bestätigen"
@@ -4167,9 +4190,8 @@ msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Einstellungen"
+msgstr "SMS Einstellungen"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4182,9 +4204,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Einstellungen gesichert."
+msgstr "SMS Einstellungen gesichert."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4223,9 +4244,8 @@ msgstr "Die Bestätigungsnummer ist falsch."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+msgstr "SMS Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4235,9 +4255,8 @@ msgstr "Dies ist nicht deine Telefonnummer."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "SMS-Telefonnummer"
+msgstr "SMS Telefonnummer wurde entfernt."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4268,7 +4287,7 @@ msgstr "Kein Code eingegeben"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Snapshots"
@@ -4278,27 +4297,27 @@ msgstr "Verwalten Snapshot-Konfiguration"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Der Wert zum Ausführen von Snapshots ist ungültig."
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Die Snapshot-Frequenz muss eine Zahl sein."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "Ungültige Snapshot-Berichts-URL."
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
-msgstr ""
+msgstr "Zufällig während Webseitenbesuchen"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
-msgstr ""
+msgstr "Als zeitlich geplanten Auftrag"
#: actions/snapshotadminpanel.php:206
msgid "Data snapshots"
-msgstr ""
+msgstr "Daten-Snapshot"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
@@ -4310,7 +4329,7 @@ msgstr "Frequenz"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Snapshots werden all N Webseitenbesuche gesendet"
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
@@ -4318,7 +4337,7 @@ msgstr "URL melden"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "An diese Adresse werden Snapshots gesendet"
#: actions/snapshotadminpanel.php:248
msgid "Save snapshot settings"
@@ -4524,7 +4543,6 @@ msgid "User is not silenced."
msgstr "Der Benutzer ist nicht ruhig gestellt."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "Keine Profil-ID in der Anfrage."
@@ -4623,7 +4641,7 @@ msgstr ""
"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
"„Abbrechen“."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Lizenz"
@@ -4679,17 +4697,17 @@ msgstr ""
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Die URI „%s“ für den Stream ist zu lang."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
#: actions/userauthorization.php:329
#, php-format
@@ -4753,18 +4771,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Aktualisierungen von %1$s auf %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4773,11 +4791,11 @@ msgstr ""
"Die Seite wird mit %1$s Version %2$s betrieben. Copyright 2008-2010 "
"StatusNet, Inc. und Mitarbeiter"
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Mitarbeiter"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4789,7 +4807,7 @@ msgstr ""
"wie veröffentlicht durch die Free Software Foundation, entweder Version 3 "
"der Lizenz, oder jede höhere Version."
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4801,7 +4819,7 @@ msgstr ""
"MARKTREIFE oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU "
"Affero General Public License für weitere Details. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4810,20 +4828,20 @@ msgstr ""
"Du hast eine Kopie der GNU Affero General Public License zusammen mit diesem "
"Programm erhalten. Wenn nicht, siehe %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Erweiterungen"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Version"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autor(en)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4832,12 +4850,12 @@ msgstr ""
"Keine Datei darf größer als %d Bytes sein und die Datei die du verschicken "
"wolltest ist %d Bytes groß. Bitte eine kleinere Datei hoch laden."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Eine Datei dieser Größe überschreitet deine User Quota von %d Byte."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4878,27 +4896,27 @@ msgid "Could not update message with new URI."
msgstr "Konnte Nachricht nicht mit neuer URI versehen."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4906,22 +4924,22 @@ msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5023,189 +5041,189 @@ msgid "Untitled page"
msgstr "Seite ohne Titel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Hauptnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Eigene"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Zum Dienst verbinden"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Verbinden"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Seiteneinstellung ändern"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Einladen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Abmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Neues Konto erstellen"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrieren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Anmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Hilfe"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Suchen"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Seitennachricht"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Lokale Ansichten"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Neue Nachricht"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Unternavigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Hilfe"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Ãœber"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "AGB"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privatsphäre"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Quellcode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Plakette"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5214,13 +5232,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5232,20 +5250,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5253,49 +5271,49 @@ msgstr ""
"vorbehalten."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
"vorbehalten."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+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:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Vorher"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
-msgstr ""
+msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr "Fremdinhalt kann noch nicht eingebunden werden."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden."
@@ -5326,64 +5344,64 @@ msgid "Unable to delete design setting."
msgstr "Konnte die Design Einstellungen nicht löschen."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Basis Seiteneinstellungen"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Seite"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Motiv-Konfiguration"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Design"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Benutzereinstellung"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Benutzer"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Zugangskonfiguration"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Pfadkonfiguration"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Sitzungseinstellungen"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Seitennachricht bearbeiten"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Snapshot Konfiguration"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
@@ -5472,13 +5490,11 @@ msgstr "Abbrechen"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
msgstr "Lese/Schreibzugriff"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
msgstr "Schreibgeschützt"
@@ -5486,14 +5502,13 @@ msgstr "Schreibgeschützt"
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Genehmigte %1$s - \"%2$s\" Zugriff."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Entfernen"
+msgstr "Widerrufen"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5518,11 +5533,11 @@ msgstr "Nachrichten in denen dieser Anhang erscheint"
msgid "Tags for this attachment"
msgstr "Stichworte für diesen Anhang"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Passwort konnte nicht geändert werden"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Passwort kann nicht geändert werden"
@@ -5604,7 +5619,7 @@ msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
@@ -5616,14 +5631,14 @@ msgstr "Vollständiger Name: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Standort: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -5646,7 +5661,7 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
@@ -6158,8 +6173,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Wenn du dir sicher bist, das dieses Benutzerkonto missbräuchlich benutzt "
+"wurde, kannst du das Benutzerkonto von deiner Liste der Abonnenten sperren "
+"und es den Seitenadministratoren unter %s als Spam melden."
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6186,19 +6211,19 @@ msgstr ""
"$s ändern.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografie: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6220,30 +6245,32 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s Status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-Konfiguration"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+msgstr ""
+"%s: bestätige mit folgendem Code, dass es sich um deine Telefonnummer "
+"handelt:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du wurdest von %s angestupst"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6271,13 +6298,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Neue private Nachricht von %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6311,13 +6338,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6349,22 +6376,25 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"Die komplette Unterhaltung kann hier gelesen werden:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
"%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6390,6 +6420,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) hat dir gerade eine Nachricht (eine '@-Antwort') auf %2$s "
+"gesendet.\n"
+"\n"
+"Die Nachricht findest du hier:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Sie lautet:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sHier kannst du auf die Nachricht antworten:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Eine Liste aller @-Antworten an dich findest du hier:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Hochachtungsvoll dein,\n"
+"%2$s\n"
+"\n"
+"P.S. Diese E-Mail Benachrichtigung kannst du hier deaktivieren: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6404,7 +6457,7 @@ msgstr ""
"schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir "
"Nachrichten schicken, die nur Du sehen kannst."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "von"
@@ -6566,23 +6619,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "in"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "im Zusammenhang"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Wiederholt von"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Antworten"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Nachricht wiederholt"
@@ -6655,7 +6708,7 @@ msgstr "Deine gesendeten Nachrichten"
msgid "Tags in %s's notices"
msgstr "Stichworte in %ss Nachrichten"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Unbekannter Befehl"
@@ -6692,7 +6745,7 @@ msgstr "Tagesdurchschnitt"
msgid "All groups"
msgstr "Alle Gruppen"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Nicht unterstützte Methode."
@@ -6716,10 +6769,9 @@ msgstr "Beliebte Benutzer"
msgid "Popular"
msgstr "Beliebte Beiträge"
-#: lib/redirectingaction.php:94
-#, fuzzy
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
-msgstr "Kein id Argument."
+msgstr "Kein Rückkehr Argument."
#: lib/repeatform.php:107
msgid "Repeat this notice?"
@@ -6738,7 +6790,7 @@ msgstr "Diese Nachricht wiederholen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt."
@@ -6825,17 +6877,62 @@ msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Personen-Tagwolke, wie man sich selbst markiert hat."
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Personen-Tag, wie markiert wurde"
#: lib/tagcloudsection.php:56
msgid "None"
msgstr "Nichts"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Systemfehler beim hochladen der Datei."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Aktualisierung des Avatars fehlgeschlagen."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Fehler beim Aktualisieren des entfernten Profils."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Top-Schreiber"
@@ -6916,56 +7013,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "vor einer Minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "vor einer Stunde"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "vor einem Tag"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "vor einem Monat"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "vor einem Jahr"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 8fc8ac6c4..803c3b34b 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:29+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:17+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "ΠÏόσβαση"
@@ -86,25 +86,25 @@ msgid "Save"
msgstr "Αποθήκευση"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Δεν υπάÏχει τέτοια σελίδα"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -117,7 +117,7 @@ msgid "No such user."
msgstr "Κανένας τέτοιος χÏήστης."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s και φίλοι, σελίδα 2%$d"
@@ -125,33 +125,33 @@ msgstr "%1$s και φίλοι, σελίδα 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s και οι φίλοι του/της"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Ροή φίλων του/της %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Ροή φίλων του/της %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Ροή φίλων του/της %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -159,7 +159,7 @@ msgstr ""
"Αυτό είναι το χÏονοδιάγÏαμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει "
"καμία αποστολή ακόμα."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -169,14 +169,14 @@ msgstr ""
"(%%action.groups%%) ή αποστείλετε κάτι ο ίδιος."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -184,65 +184,65 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Εσείς και οι φίλοι σας"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Απέτυχε η ενημέÏωση του χÏήστη."
@@ -264,7 +264,7 @@ msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -322,41 +322,41 @@ msgstr ""
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr ""
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
@@ -394,120 +394,120 @@ msgstr "Απέτυχε η ενημέÏωση του χÏήστη."
msgid "Could not find target user."
msgstr "Απέτυχε η εÏÏεση οποιασδήποτε κατάστασης."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Το ψευδώνυμο Ï€Ïέπει να έχει μόνο πεζοÏÏ‚ χαÏακτήÏες και χωÏίς κενά."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Το ψευδώνυμο είναι ήδη σε χÏήση. Δοκιμάστε κάποιο άλλο."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr ""
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Το ονοματεπώνυμο είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 255 χαÏακτ.)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Η πεÏιγÏαφή είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο %d χαÏακτ.)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Η τοποθεσία είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο 255 χαÏακτ.)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Μήνυμα"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Το ψευδώνυμο είναι ήδη σε χÏήση. Δοκιμάστε κάποιο άλλο."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Η ομάδα δεν βÏέθηκε!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr ""
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "ομάδες των χÏηστών %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Δεν είστε μέλος καμίας ομάδας."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "ομάδες του χÏήστη %s"
@@ -523,15 +523,15 @@ msgstr "Μήνυμα"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -594,12 +594,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "ΛογαÏιασμός"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -607,8 +607,8 @@ msgid "Nickname"
msgstr "Ψευδώνυμο"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Κωδικός"
@@ -624,11 +624,11 @@ msgstr "Îα επιτÏαπεί"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -647,25 +647,25 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος
msgid "Already repeated that notice."
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Η κατάσταση διεγÏάφη."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr ""
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -674,32 +674,32 @@ msgstr ""
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -714,12 +714,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -776,7 +776,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ΔιαγÏαφή"
@@ -818,11 +818,11 @@ msgstr "Ρυθμίσεις OpenID"
msgid "You already blocked that user."
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr ""
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -834,7 +834,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -844,7 +844,7 @@ msgstr "Όχι"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
@@ -854,7 +854,7 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -863,11 +863,11 @@ msgid "Yes"
msgstr "Îαι"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -999,7 +999,7 @@ msgstr "Ομάδες με τα πεÏισσότεÏα μέλη"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1033,7 +1033,7 @@ msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr ""
@@ -1064,7 +1064,7 @@ msgid "Do not delete this notice"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1103,48 +1103,57 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Αλλάξτε τον κωδικό σας"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Αλλαγή"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Αλλαγή"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Αλλαγή"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1152,57 +1161,65 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Αλλαγή χÏωμάτων"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "ΠεÏιεχόμενο"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "ΣÏνδεσμοι"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1212,7 +1229,7 @@ msgstr ""
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1499,7 +1516,7 @@ msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1732,13 +1749,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1876,7 +1893,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "χÏονοδιάγÏαμμα του χÏήστη %s"
@@ -2262,39 +2279,39 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ήδη συνδεδεμένος."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Λάθος όνομα χÏήστη ή κωδικός"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ΣÏνδεση"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Αυτόματη σÏνδεση στο μέλλον. ΟΧΙ για κοινόχÏηστους υπολογιστές!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2302,11 +2319,15 @@ msgstr ""
"Για λόγους ασφαλείας, παÏακαλώ εισάγετε ξανά το όνομα χÏήστη και τον κωδικό "
"σας, Ï€Ïιν αλλάξετε τις Ïυθμίσεις σας."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ΣÏνδεση με όνομα χÏήστη και κωδικό"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Συνδεθείτε με το όνομα χÏήστη και τον κωδικό σας. Δεν έχετε όνομα χÏήστη "
"ακόμα; Κάντε [εγγÏαφή](%%action.register%%) για ένα νέο λογαÏιασμό ή "
@@ -2504,31 +2525,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "ΣÏνδεση"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2638,7 +2659,7 @@ msgid "6 or more characters"
msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Επιβεβαίωση"
@@ -2650,11 +2671,11 @@ msgstr ""
msgid "Change"
msgstr "Αλλαγή"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Οι κωδικοί δεν ταυτίζονται."
@@ -2675,7 +2696,7 @@ msgid "Password saved."
msgstr "Ο κωδικός αποθηκεÏτηκε."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2882,44 +2903,44 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 μικÏά γÏάμματα ή αÏιθμοί, χωÏίς σημεία στίξης ή κενά"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Ονοματεπώνυμο"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ΑÏχική σελίδα"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "ΠεÏιέγÏαψε τον εαυτό σου και τα ενδιαφέÏοντά σου σε 140 χαÏακτήÏες"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "ΠεÏιέγÏαψε τον εαυτό σου και τα ενδιαφέÏοντά σου σε 140 χαÏακτήÏες"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ΒιογÏαφικό"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Τοποθεσία"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2962,7 +2983,7 @@ msgstr ""
"Αυτόματα γίνε συνδÏομητής σε όσους γίνονται συνδÏομητές σε μένα (χÏήση "
"κυÏίως από λογισμικό και όχι ανθÏώπους)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογÏαφικό είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 140 χαÏακτ.)."
@@ -3211,7 +3232,7 @@ msgstr "Ο κωδικός Ï€Ïέπει να είναι 6 χαÏακτήÏες ή
msgid "Password and confirmation do not match."
msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3219,71 +3240,93 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Η διεÏθυνση email υπάÏχει ήδη."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr ""
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 μικÏά γÏάμματα ή αÏιθμοί, χωÏίς σημεία στίξης ή κενά. ΑπαÏαίτητο."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες. ΑπαÏαίτητο."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3292,7 +3335,7 @@ msgstr ""
"εκτός από τα εξής Ï€Ïοσωπικά δεδομένα: κωδικός Ï€Ïόσβασης, διεÏθυνση email, "
"διεÏθυνση IM, τηλεφωνικό νοÏμεÏο."
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3326,7 +3369,7 @@ msgstr ""
"ΕυχαÏιστοÏμε που εγγÏάφηκες και ευχόμαστε να πεÏάσεις καλά με την υπηÏεσία "
"μας."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3407,7 +3450,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "ΔημιουÏγία"
@@ -3478,7 +3521,7 @@ msgstr "Απέτυχε η ενημέÏωση του χÏήστη."
msgid "User doesn't have this role."
msgstr ""
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Η κατάσταση διαγÏάφεται."
@@ -3493,7 +3536,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3537,7 +3580,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3550,7 +3593,7 @@ msgid "Organization"
msgstr "ΠÏοσκλήσεις"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "ΠεÏιγÏαφή"
@@ -4147,7 +4190,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4491,7 +4534,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4613,29 +4656,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr ""
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4643,7 +4686,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4651,40 +4694,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "ΠÏοσωπικά"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4727,45 +4770,45 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4872,200 +4915,200 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "ΠÏοσωπικά"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Αλλάξτε τον κωδικό σας"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Αδυναμία ανακατεÏθηνσης στο διακομιστή: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "ΣÏνδεση"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "ΔιαχειÏιστής"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ΠÏοσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Μήνυμα"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "ΑποσÏνδεση"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "ΔημιουÏγία ενός λογαÏιασμοÏ"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "ΠεÏιγÏαφή"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "ΣÏνδεση"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Βοηθήστε με!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Βοήθεια"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Βοήθεια"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "ΠεÏί"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Συχνές εÏωτήσεις"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5075,14 +5118,14 @@ msgstr ""
"έφεÏε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
"Το **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου)."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5091,54 +5134,54 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr ""
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5146,11 +5189,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5181,73 +5224,73 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "ΠÏοσωπικά"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "ΔιαγÏαφή μηνÏματος"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5378,12 +5421,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Ο κωδικός αποθηκεÏτηκε."
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Ο κωδικός αποθηκεÏτηκε."
@@ -5476,14 +5519,14 @@ msgstr "Ονοματεπώνυμο"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5967,8 +6010,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5984,7 +6034,7 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -5992,13 +6042,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6012,30 +6062,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Κατάσταση του/της %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νοÏμεÏο τηλεφώνου."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6052,13 +6102,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6078,13 +6128,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6106,7 +6156,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6114,13 +6164,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6157,7 +6207,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "από"
@@ -6314,23 +6364,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Επαναλαμβάνεται από"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Ρυθμίσεις OpenID"
@@ -6405,7 +6455,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6442,7 +6492,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6466,7 +6516,7 @@ msgstr "ΠÏοτεινόμενα"
msgid "Popular"
msgstr "Δημοφιλή"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6489,7 +6539,7 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6589,6 +6639,49 @@ msgstr ""
msgid "None"
msgstr "Κανένα"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr ""
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "ΚοÏυφαίοι δημοσιευτές"
@@ -6672,56 +6765,56 @@ msgid "Moderator"
msgstr "Συντονιστής"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 38feccec7..96dc69be6 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to British English
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Bruce89
# Author@translatewiki.net: CiaranG
# Author@translatewiki.net: Reedy
@@ -10,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:32+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:21+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +24,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Access"
@@ -44,7 +45,6 @@ msgstr "Prohibit anonymous users (not logged in) from viewing site?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Private"
@@ -81,31 +81,29 @@ msgstr "Save access settings"
#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
#: actions/imsettings.php:184 actions/smssettings.php:209
#: lib/applicationeditform.php:361
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Save"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "No such page"
+msgstr "No such page."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -118,7 +116,7 @@ msgid "No such user."
msgstr "No such user."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s and friends, page %2$d"
@@ -126,40 +124,40 @@ msgstr "%1$s and friends, page %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s and friends"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed for friends of %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed for friends of %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed for friends of %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
"This is the timeline for %s and friends but no one has posted anything yet."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -169,7 +167,7 @@ msgstr ""
"something yourself."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -178,7 +176,7 @@ msgstr ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,67 +186,66 @@ msgstr ""
"post a notice to his or her attention."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "You and friends"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates from %1$s and friends on %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API method not found."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "This method requires a POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
-"none"
+"none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Couldn't update user."
@@ -270,7 +267,7 @@ msgstr "Couldn't save profile."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -329,41 +326,41 @@ msgstr "Direct messages to %s"
msgid "All the direct messages sent to %s"
msgstr "All the direct messages sent to %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "No message text!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "That's too long. Max message size is %d chars."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Recipient user not found."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Can't send direct messages to users who aren't your friend."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "No status found with that ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "This status is already a favourite."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Could not create favourite."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "That status is not a favourite."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Could not delete favourite."
@@ -396,120 +393,119 @@ msgstr "Could not determine source user."
msgid "Could not find target user."
msgstr "Could not find target user."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Nickname already in use. Try another one."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Not a valid nickname."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Homepage is not a valid URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Full name is too long (max 255 chars)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Description is too long (max %d chars)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Location is too long (max 255 chars)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Too many aliases! Maximum %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Invalid alias: \"%s\""
+msgstr "Invalid alias: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" already in use. Try another one."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias can't be the same as nickname."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "Group not found!"
+msgstr "Group not found."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "You are already a member of that group."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "You have been blocked from that group by the admin."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Could not join user %1$s to group %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "You are not a member of this group."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Could not remove user %1$s to group %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s's groups"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#: actions/apigrouplist.php:108
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Groups %s is a member of"
+msgstr "%1$s groups %2$s is a member of."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s groups"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "groups on %s"
@@ -524,15 +520,15 @@ msgstr "Invalid token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -598,12 +594,12 @@ msgstr ""
"give access to your %4$s account to third parties you trust."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +607,8 @@ msgid "Nickname"
msgstr "Nickname"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Password"
@@ -628,11 +624,11 @@ msgstr "Allow"
msgid "Allow or deny access to your account information."
msgstr "Allow or deny access to your account information."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "This method requires a POST or DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "You may not delete another user's status."
@@ -649,25 +645,25 @@ msgstr "Cannot repeat your own notice."
msgid "Already repeated that notice."
msgstr "Already repeated that notice."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Status deleted."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "No status with that ID found."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "That's too long. Max notice size is %d chars."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Not found."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Max notice size is %d chars, including attachment URL."
@@ -676,32 +672,32 @@ msgstr "Max notice size is %d chars, including attachment URL."
msgid "Unsupported format."
msgstr "Unsupported format."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favourites from %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s updates favourited by %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Updates mentioning %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates that reply to updates from %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s public timeline"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates from everyone!"
@@ -716,12 +712,12 @@ msgstr "Repeated to %s"
msgid "Repeats of %s"
msgstr "Repeats of %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notices tagged with %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates tagged with %1$s on %2$s!"
@@ -778,7 +774,7 @@ msgid "Preview"
msgstr "Preview"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Delete"
@@ -791,9 +787,8 @@ msgid "Crop"
msgstr "Crop"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "No profile specified."
+msgstr "No file uploaded."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -819,11 +814,11 @@ msgstr "Avatar deleted."
msgid "You already blocked that user."
msgstr "You already blocked that user."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Block user"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -838,17 +833,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Do not block this user"
@@ -857,20 +851,19 @@ msgstr "Do not block this user"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Failed to save block information."
@@ -916,9 +909,9 @@ msgstr "Unblock this user"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Post to "
+msgstr "Post to %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -934,9 +927,9 @@ msgstr "That confirmation code is not for you!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Unrecognised address type %s"
+msgstr "Unrecognized address type %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -997,7 +990,7 @@ msgstr "You are not the owner of this application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -1031,7 +1024,7 @@ msgstr "Delete this application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Not logged in."
@@ -1062,7 +1055,7 @@ msgid "Do not delete this notice"
msgstr "Do not delete this notice"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -1102,45 +1095,54 @@ msgstr "Design"
msgid "Design settings for this StatusNet site."
msgstr "Design settings for this StausNet site."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "nvalid logo URL."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "Theme not available: %s"
+msgstr "Theme not available: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Change logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Site logo"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Change theme"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Site theme"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Theme for the site."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Site theme"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Change background image"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1150,57 +1152,65 @@ msgstr ""
"$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Turn background image on or off."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tile background image"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Change colours"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Content"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidebar"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Use defaults"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restore default designs"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reset back to default"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1210,7 +1220,7 @@ msgstr "Reset back to default"
msgid "Save"
msgstr "Save"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Save design"
@@ -1363,7 +1373,6 @@ msgstr "Current confirmed e-mail address."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remove"
@@ -1382,7 +1391,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel"
@@ -1397,7 +1405,6 @@ msgstr "E-mail address, like \"UserName@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Add"
@@ -1423,16 +1430,14 @@ msgstr "Make a new e-mail address for posting to - cancels the old one."
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "New"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferences"
+msgstr "Email preferences"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1471,9 +1476,8 @@ msgstr "Publish a MicroID for my e-mail address."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Design preferences saved."
+msgstr "Email preferences saved."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1486,7 +1490,7 @@ msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
@@ -1528,15 +1532,13 @@ msgstr "No pending confirmation to cancel."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "That is the wrong IM address."
+msgstr "That is the wrong email address."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmation cancelled."
+msgstr "Email confirmation cancelled."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1546,9 +1548,8 @@ msgstr "That is not your e-mail address."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "The address was removed."
+msgstr "The email address was removed."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1686,7 +1687,6 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Remote service uses unknown version of OMB protocol."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
msgstr "Error updating remote profile."
@@ -1699,33 +1699,30 @@ msgid "Cannot read file."
msgstr "Cannot read file."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Invalid token."
+msgstr "Invalid role."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "This role is reserved and cannot be set."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "You cannot sandbox users on this site."
+msgstr "You cannot grant user roles on this site."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "User is already silenced."
+msgstr "User already has this role."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No profile specified."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No profile with that ID."
@@ -1865,7 +1862,7 @@ msgstr "Make this user an admin"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s timeline"
@@ -1929,6 +1926,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
#: actions/groupsearch.php:85
#, php-format
@@ -1936,10 +1935,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Only an admin can unblock group members."
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
@@ -2005,9 +2006,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferences"
+msgstr "IM preferences"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2078,15 +2078,13 @@ msgstr "That is the wrong IM address."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Couldn't delete e-mail confirmation."
+msgstr "Couldn't delete IM confirmation."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmation cancelled."
+msgstr "IM confirmation cancelled."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2096,9 +2094,8 @@ msgstr "That is not your Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "The address was removed."
+msgstr "The IM address was removed."
#: actions/inbox.php:59
#, php-format
@@ -2119,9 +2116,9 @@ msgid "Invites have been disabled."
msgstr ""
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "You must be logged in to invite other users to use %s"
+msgstr "You must be logged in to invite other users to use %s."
#: actions/invite.php:72
#, php-format
@@ -2189,7 +2186,6 @@ msgstr "Optionally add a personal message to the invitation."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Send"
@@ -2288,39 +2284,39 @@ msgstr "You are not a member of that group."
msgid "%1$s left group %2$s"
msgstr "%1$s left group %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Already logged in."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Incorrect username or password."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Error setting user. You are probably not authorised."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Lost or forgotten password?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2328,18 +2324,20 @@ msgstr ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Login with your username and password."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Only and admin can make another user an admin."
#: actions/makeadmin.php:96
#, php-format
@@ -2357,9 +2355,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Can't make %1$s an admin for group %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "No current status"
+msgstr "No current status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2503,16 +2500,16 @@ msgstr "OAuth applications"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Applications you have registered"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "You have not registered any applications yet."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Connected applications"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
@@ -2535,31 +2532,30 @@ msgstr "You have not authorised any applications to use your account."
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Notice has no profile"
+msgstr "Notice has no profile."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s's status on %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "content type "
+msgstr "Content type %s not supported."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2662,7 +2658,7 @@ msgid "6 or more characters"
msgstr "6 or more characters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirm"
@@ -2674,11 +2670,11 @@ msgstr "Same as password above"
msgid "Change"
msgstr "Change"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Password must be 6 or more characters."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passwords don't match."
@@ -2699,7 +2695,7 @@ msgid "Password saved."
msgstr "Password saved."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2708,24 +2704,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr ""
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Theme directory not readable: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Avatar directory not writable: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Background directory not writable: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Locales directory not readable: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2865,9 +2861,9 @@ msgid "People search"
msgstr "People Search"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Not a valid people tag: %s"
+msgstr "Not a valid people tag: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2875,9 +2871,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Users self-tagged with %1$s - page %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Invalid notice content"
+msgstr "Invalid notice content."
#: actions/postnotice.php:101
#, php-format
@@ -2902,43 +2897,43 @@ msgstr "Profile information"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Full name"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL of your homepage, blog, or profile on another site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Describe yourself and your interests in %d chars"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Describe yourself and your interests"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Location"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Where you are, like \"City, State (or Region), Country\""
@@ -2980,7 +2975,7 @@ msgid ""
msgstr ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max %d chars)."
@@ -3235,7 +3230,7 @@ msgstr "Password must be 6 chars or more."
msgid "Password and confirmation do not match."
msgstr "Password and confirmation do not match."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error setting user."
@@ -3243,80 +3238,102 @@ msgstr "Error setting user."
msgid "New password successfully saved. You are now logged in."
msgstr "New password successfully saved. You are now logged in."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Sorry, only invited people can register."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Sorry, invalid invitation code."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registration not allowed."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "You can't register if you don't agree to the licence."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-mail address already exists."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Invalid username or password."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 or more characters. Required."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Used only for updates, announcements, and password recovery"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Longer name, preferably your \"real\" name"
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3349,7 +3366,7 @@ msgstr ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3429,7 +3446,7 @@ msgstr "You can't repeat your own notice."
msgid "You already repeated that notice."
msgstr "You already repeated that notice."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repeated"
@@ -3494,16 +3511,14 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Replies to %1$s on %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "You cannot silence users on this site."
+msgstr "You cannot revoke user roles on this site."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "User without matching profile."
+msgstr "User doesn't have this role."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3517,7 +3532,7 @@ msgstr "User is already sandboxed."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3560,7 +3575,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Name"
@@ -3571,7 +3586,7 @@ msgid "Organization"
msgstr "Organization"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Description"
@@ -3897,9 +3912,8 @@ msgid "User is already silenced."
msgstr "User is already silenced."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Design settings for this StausNet site."
+msgstr "Basic settings for this StatusNet site"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
@@ -3915,9 +3929,8 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-#, fuzzy
msgid "Minimum text limit is 0 (unlimited)."
-msgstr "Minimum text limit is 140 characters."
+msgstr "Minimum text limit is 0 (unlimited)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3968,9 +3981,8 @@ msgid "Default timezone for the site; usually UTC."
msgstr ""
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Default site language"
+msgstr "Default language"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -3997,37 +4009,32 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Site notice"
+msgstr "Site Notice"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "New message"
+msgstr "Edit site-wide message"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Unable to save your design settings!"
+msgstr "Unable to save site notice."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
msgstr ""
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Site notice"
+msgstr "Site notice text"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Site notice"
+msgstr "Save site notice"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4043,15 +4050,13 @@ msgstr "You can receive SMS messages through e-mail from %%site.name%%."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:97
-#, fuzzy
msgid "SMS is not available."
-msgstr "This page is not available in a "
+msgstr "SMS is not available."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM address"
+msgstr "SMS address"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4075,7 +4080,6 @@ msgstr "Enter the code you received on your phone."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirm"
@@ -4092,9 +4096,8 @@ msgstr "Phone number, no punctuation or spaces, with area code"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferences"
+msgstr "SMS preferences"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4107,9 +4110,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferences saved."
+msgstr "SMS preferences saved."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4147,9 +4149,8 @@ msgstr "That is the wrong confirmation number."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmation cancelled."
+msgstr "SMS confirmation cancelled."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4159,9 +4160,8 @@ msgstr "That is not your phone number."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "SMS phone number"
+msgstr "The SMS phone number was removed."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4191,14 +4191,13 @@ msgstr "No code entered"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Change site configuration"
+msgstr "Manage snapshot configuration"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4245,9 +4244,8 @@ msgid "Snapshots will be sent to this URL"
msgstr ""
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Save site settings"
+msgstr "Save snapshot settings"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
@@ -4297,6 +4295,8 @@ msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favour"
#: actions/subscribers.php:110
#, php-format
@@ -4437,9 +4437,8 @@ msgid "User is not silenced."
msgstr "User is not silenced."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "No profile id in request."
+msgstr "No profile ID in request."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4454,7 +4453,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "User"
@@ -4536,7 +4534,7 @@ msgstr ""
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Rejectâ€."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "License"
@@ -4665,29 +4663,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Updates from %1$s on %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4699,7 +4697,7 @@ msgstr ""
"Software Foundation, either version 3 of the Licence, or (at your option) "
"any later version. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4711,7 +4709,7 @@ msgstr ""
"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public Licence "
"for more details. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4720,32 +4718,32 @@ msgstr ""
"You should have received a copy of the GNU Affero General Public Licence "
"along with this program. If not, see %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Version"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4784,26 +4782,26 @@ msgid "Could not update message with new URI."
msgstr "Could not update message with new URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr "DB error inserting hashtag: %s"
+msgstr "Database error inserting hashtag: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problem saving notice. Too long."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problem saving notice. Unknown user."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4811,21 +4809,21 @@ msgstr ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4852,9 +4850,8 @@ msgid "Couldn't delete self-subscription."
msgstr "Couldn't delete self-subscription."
#: classes/Subscription.php:200
-#, fuzzy
msgid "Couldn't delete subscription OMB token."
-msgstr "Couldn't delete subscription."
+msgstr "Couldn't delete subscription OMB token."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
@@ -4928,206 +4925,189 @@ msgid "Untitled page"
msgstr "Untitled page"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Primary site navigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
-#, fuzzy
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Change your e-mail, avatar, password, profile"
+msgstr "Change your email, avatar, password, profile"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connect to services"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Connect"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
-#, fuzzy
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Change site configuration"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
-#, fuzzy
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
-#, fuzzy, php-format
+#: lib/action.php:465
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
-#, fuzzy
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Invite"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
-#, fuzzy
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logout from the site"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
-#, fuzzy
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Logout"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Create an account"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
-#, fuzzy
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Register"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
-#, fuzzy
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:481
-#, fuzzy
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Login"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
-#, fuzzy
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:487
-#, fuzzy
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
-#, fuzzy
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:493
-#, fuzzy
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Search"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Site notice"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Local views"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Page notice"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "About"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "F.A.Q."
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Source"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Badge"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet software licence"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5136,13 +5116,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** is a microblogging service."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5154,54 +5134,54 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Site content license"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+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:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Before"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5209,11 +5189,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5244,68 +5224,64 @@ msgid "Unable to delete design setting."
msgstr "Unable to delete design setting."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Basic site configuration"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
-#, fuzzy
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Design configuration"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
-#, fuzzy
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Design"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "User configuration"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "User"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Access configuration"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Paths configuration"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Sessions configuration"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
-#, fuzzy
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
-msgstr "Site notice"
+msgstr "Edit site notice"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
-#, fuzzy
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
-msgstr "Paths configuration"
+msgstr "Snapshots configuration"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5408,7 +5384,6 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Revoke"
@@ -5436,11 +5411,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Password changing failed"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Password changing is not allowed"
@@ -5474,9 +5449,9 @@ msgstr "Could not find a user with nickname %s"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "Could not find a user with nickname %s"
+msgstr "Could not find a local user with nickname %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
@@ -5519,9 +5494,9 @@ msgstr "Could not join user %1$s to group %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Could not remove user %1$s to group %2$s."
+msgstr "Could not remove user %1$s to group %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5531,14 +5506,14 @@ msgstr "Fullname: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Location: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -5559,9 +5534,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5612,9 +5587,8 @@ msgid "Specify the name of the user to subscribe to"
msgstr "Specify the name of the user to subscribe to"
#: lib/command.php:628
-#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
-msgstr "You are not subscribed to that profile."
+msgstr "Can't subscribe to OMB profiles by command."
#: lib/command.php:634
#, php-format
@@ -5735,6 +5709,44 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"repeat #<notice_id> - repeat a notice with a given id\n"
+"repeat <nickname> - repeat the last notice from user\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
#: lib/common.php:135
msgid "No configuration file found. "
@@ -5770,7 +5782,7 @@ msgstr "Connections"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Authorised connected applications"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -6017,8 +6029,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s is now listening to your notices on %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6044,19 +6063,19 @@ msgstr ""
"Change your email address or notification options at %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "New e-mail address for posting to %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6078,30 +6097,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS confirmation"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Awaiting confirmation on this phone number."
+msgstr "%s: confirm you own this phone number with this code:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "You've been nudged by %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6118,13 +6137,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "New private message from %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6144,13 +6163,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) added your notice as a favorite"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6172,7 +6191,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6180,13 +6199,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6223,7 +6242,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "from"
@@ -6377,23 +6396,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repeated by"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Reply to this notice"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Reply"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Notice repeated"
@@ -6466,7 +6485,7 @@ msgstr "Your sent messages"
msgid "Tags in %s's notices"
msgstr "Tags in %s's notices"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Unknown"
@@ -6503,7 +6522,7 @@ msgstr ""
msgid "All groups"
msgstr "All groups"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6527,7 +6546,7 @@ msgstr "Featured"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No return-to arguments."
@@ -6544,11 +6563,11 @@ msgid "Repeat this notice"
msgstr "Repeat this notice"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Block this user from this group"
+msgstr "Revoke the \"%s\" role from this user"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6646,6 +6665,51 @@ msgstr ""
msgid "None"
msgstr "None"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "System error uploading file."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Failed updating avatar."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Error updating remote profile."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Top posters"
@@ -6675,9 +6739,9 @@ msgid "Unsubscribe"
msgstr "Unsubscribe"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "User has no profile."
+msgstr "User %s (%d) has no profile record."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6697,7 +6761,7 @@ msgstr "Edit profile settings"
#: lib/userprofile.php:264
msgid "Edit"
-msgstr ""
+msgstr "Edit"
#: lib/userprofile.php:287
msgid "Send a direct message to this user"
@@ -6709,75 +6773,73 @@ msgstr "Message"
#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "Moderate"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "User profile"
+msgstr "User role"
#: lib/userprofile.php:366
-#, fuzzy
msgctxt "role"
msgid "Administrator"
-msgstr "Admins"
+msgstr "Administrator"
#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "a few seconds ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "about a minute ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "about an hour ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "about a day ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "about a month ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 39c2e95b8..56f866af8 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,9 +1,11 @@
# Translation of StatusNet to Spanish
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Crazymadlover
# Author@translatewiki.net: Locos epraix
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: PerroVerd
+# Author@translatewiki.net: Pertile
# Author@translatewiki.net: Peter17
# Author@translatewiki.net: Translationista
# --
@@ -13,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:36+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:25+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -26,7 +28,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Acceder"
@@ -88,24 +90,24 @@ msgid "Save"
msgstr "Guardar"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "No existe tal página."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -118,7 +120,7 @@ msgid "No such user."
msgstr "No existe ese usuario."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s y sus amistades, página %2$d"
@@ -126,33 +128,33 @@ msgstr "%1$s y sus amistades, página %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s y sus amistades"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed de los amigos de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed de los amigos de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed de los amigos de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -160,7 +162,7 @@ msgstr ""
"Esta es la línea temporal de %s y amistades, pero nadie ha publicado nada "
"todavía."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -170,7 +172,7 @@ msgstr ""
"todavía."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -179,7 +181,7 @@ msgstr ""
"Puedes intentar [darle un toque a %1$s](../%2$s) desde su perfil o [publicar "
"algo a su atención](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -189,58 +191,58 @@ msgstr ""
"toque a %s o publicar algo a su atención?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Tú y tus amistades"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método de API no encontrado."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Este método requiere un POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -248,7 +250,7 @@ msgstr ""
"Tienes que especificar un parámetro llamdao 'dispositivo' con un valor a "
"elegir entre: sms, im, ninguno."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "No se pudo actualizar el usuario."
@@ -268,7 +270,7 @@ msgstr "No se pudo guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -327,41 +329,41 @@ msgstr "Mensajes directos a %s"
msgid "All the direct messages sent to %s"
msgstr "Todos los mensajes directos enviados a %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "¡Sin texto de mensaje!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "No se encuentra usuario receptor."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "No se encontró estado para ese ID"
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Este status ya está en favoritos."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "No se pudo crear favorito."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Este status no es un favorito."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "No se pudo borrar favorito."
@@ -394,121 +396,121 @@ msgstr "No se pudo determinar el usuario fuente."
msgid "Could not find target user."
msgstr "No se pudo encontrar ningún usuario de destino."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"El usuario debe tener solamente letras minúsculas y números y no puede tener "
"espacios."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "El usuario ya existe. Prueba con otro."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Usuario inválido"
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "La página de inicio no es un URL válido."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descripción es demasiado larga (máx. %d caracteres)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "¡Muchos seudónimos! El máximo es %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias inválido: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "El alias no puede ser el mismo que el usuario."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Grupo no encontrado."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Ya eres miembro de ese grupo"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Has sido bloqueado de ese grupo por el administrador."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "No se pudo unir el usuario %s al grupo %s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "No eres miembro de este grupo."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Grupos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s grupos %2$s es un miembro de."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Grupos %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "Grupos en %s"
@@ -523,15 +525,15 @@ msgstr "Token inválido."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -600,12 +602,12 @@ msgstr ""
"debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Cuenta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -613,8 +615,8 @@ msgid "Nickname"
msgstr "Usuario"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contraseña"
@@ -630,11 +632,11 @@ msgstr "Permitir"
msgid "Allow or deny access to your account information."
msgstr "Permitir o denegar el acceso a la información de tu cuenta."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método requiere un PUBLICAR O ELIMINAR"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "No puedes borrar el estado de otro usuario."
@@ -651,25 +653,25 @@ msgstr "No puedes repetir tus propias notificaciones."
msgid "Already repeated that notice."
msgstr "Esta notificación ya se ha repetido."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Status borrado."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "No hay estado para ese ID"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: 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."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "No encontrado."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -680,32 +682,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato no soportado."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritos de %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizaciones favoritas de %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualizaciones que mencionan %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "línea temporal pública de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "¡Actualizaciones de todos en %s!"
@@ -720,12 +722,12 @@ msgstr "Repetido a %s"
msgid "Repeats of %s"
msgstr "Repeticiones de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Avisos etiquetados con %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
@@ -782,7 +784,7 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Borrar"
@@ -822,11 +824,11 @@ msgstr "Imagen borrada."
msgid "You already blocked that user."
msgstr "Ya has bloqueado a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -841,7 +843,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -850,7 +852,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquear a este usuario"
@@ -859,7 +861,7 @@ msgstr "No bloquear a este usuario"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -867,11 +869,11 @@ msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
@@ -999,7 +1001,7 @@ msgstr "No eres el propietario de esta aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -1033,7 +1035,7 @@ msgstr "Borrar esta aplicación"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "No conectado."
@@ -1064,7 +1066,7 @@ msgid "Do not delete this notice"
msgstr "No eliminar este mensaje"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -1104,45 +1106,53 @@ msgstr "Diseño"
msgid "Design settings for this StatusNet site."
msgstr "Configuración de diseño de este sitio StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL de logotipo inválido."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Cambiar logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo del sitio"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Cambiar el tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Tema del sitio"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema para el sitio."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Personalizar tema"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Cambiar la imagen de fondo"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1152,57 +1162,65 @@ msgstr ""
"es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Activar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivar"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar o desactivar la imagen de fondo."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Imagen de fondo en mosaico"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Contenido"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Vínculos"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Personalizar CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilizar los valores predeterminados"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar los diseños predeterminados"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Volver a los valores predeterminados"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1212,7 +1230,7 @@ msgstr "Volver a los valores predeterminados"
msgid "Save"
msgstr "Guardar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Guardar el diseño"
@@ -1485,7 +1503,7 @@ msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
@@ -1622,7 +1640,7 @@ msgstr "Avisos favoritos de %s"
#: actions/favoritesrss.php:115
#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "¡Actualizaciones favorecidas por %1$ s en %2$s!"
+msgstr "¡Actualizaciones favorecidas por %1$s en %2$s!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
@@ -1713,13 +1731,13 @@ msgstr "El usuario ya tiene esta función."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No se especificó perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No existe perfil con ese ID"
@@ -1862,7 +1880,7 @@ msgstr "Convertir a este usuario en administrador"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "línea temporal de %s"
@@ -2288,41 +2306,41 @@ msgstr "No eres miembro de este grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha dejado el grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ya estás conectado."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
"compartidos! "
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "¿Contraseña olvidada o perdida?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2330,14 +2348,17 @@ msgstr ""
"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
"contraseña antes de cambiar tu configuración."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Ingresar con tu nombre de usuario y contraseña."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Inicia sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea](%%"
-"action.register%%) una cuenta."
+"Aún no tienes nombre de usuario? [Registrar](%%action.register%%) una nueva "
+"cuenta."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2541,30 +2562,30 @@ msgstr ""
"Los desarrolladores pueden editar la configuración de registro de sus "
"aplicaciones "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Aviso no tiene perfil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "estado de %1$s en %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Tipo de contenido %s no soportado."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Solamente %s URLs sobre HTTP simples por favor."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -2668,7 +2689,7 @@ msgid "6 or more characters"
msgstr "6 o más caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2680,11 +2701,11 @@ msgstr "Igual a la contraseña de arriba"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Cotrnaseña debe tener 6 o más caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Las contraseñas no coinciden"
@@ -2705,7 +2726,7 @@ msgid "Password saved."
msgstr "Se guardó Contraseña."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Rutas"
@@ -2911,43 +2932,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nombre completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página de inicio"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descríbete y cuéntanos tus intereses en %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descríbete y cuéntanos acerca de tus intereses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografía"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicación"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
@@ -2991,7 +3012,7 @@ msgstr ""
"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
"para no-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografía es muy larga (máx. %d caracteres)."
@@ -3260,7 +3281,7 @@ msgstr "La contraseña debe tener 6 o más caracteres."
msgid "Password and confirmation do not match."
msgstr "La contraseña y la confirmación no coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error al configurar el usuario."
@@ -3268,39 +3289,39 @@ msgstr "Error al configurar el usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Disculpa, sólo personas invitadas pueden registrarse."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "El código de invitación no es válido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registro de usuario no permitido."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "La dirección de correo electrónico ya existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Usuario o contraseña inválidos."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3308,36 +3329,60 @@ msgstr ""
"Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
"avisos y enviar vínculos de ellos a tus amigos y colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
"Requerido."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o más caracters. Requerido."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+"Mi texto y archivos est'an protegidos por los derecho de autor de %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Todos los derechos reservados."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3347,7 +3392,7 @@ msgstr ""
"información privada: contraseña, dirección de correo electrónico, dirección "
"de mensajería instantánea y número de teléfono."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3380,7 +3425,7 @@ msgstr ""
"\n"
"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3463,7 +3508,7 @@ msgstr "No puedes repetir tus propios mensajes."
msgid "You already repeated that notice."
msgstr "Ya has repetido este mensaje."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetido"
@@ -3537,7 +3582,7 @@ msgstr "No puedes revocar funciones de usuario en este sitio."
msgid "User doesn't have this role."
msgstr "El usuario no tiene esta función."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3551,7 +3596,7 @@ msgstr "Al usuario ya se le ha impuesto restricciones."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sesiones"
@@ -3594,7 +3639,7 @@ msgid "Icon"
msgstr "Icono"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nombre"
@@ -3605,7 +3650,7 @@ msgid "Organization"
msgstr "Organización"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Descripción"
@@ -4229,7 +4274,7 @@ msgstr "No ingresó código"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Capturas"
@@ -4584,7 +4629,7 @@ msgstr ""
"avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, "
"haz clic en \"Cancelar\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licencia"
@@ -4713,18 +4758,18 @@ msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos."
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "¡Actualizaciones de %1$s en %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "%s StatusNet"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4733,11 +4778,11 @@ msgstr ""
"Este sitio ha sido desarrollado con %1$s, versión %2$s, Derechos Reservados "
"2008-2010 StatusNet, Inc. y sus colaboradores."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Colaboradores"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4749,7 +4794,7 @@ msgstr ""
"publicado por la Fundación del Software Libre, bien por la versión 3 de la "
"Licencia, o cualquier versión posterior (la de tu elección). "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4761,7 +4806,7 @@ msgstr ""
"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General "
"de Affero AGPL para más detalles. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4770,20 +4815,20 @@ msgstr ""
"Debes haber recibido una copia de la Licencia Pública General de Affero GNU "
"con este programa. Si no la recibiste, visita %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Versión"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autor(es)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4792,13 +4837,13 @@ msgstr ""
"No puede haber un archivo de tamaño mayor a %d bytes y el archivo subido es "
"de %d bytes. Por favor, intenta subir una versión más ligera."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Un archivo tan grande podría sobrepasar tu cuota de usuario de %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Un archivo tan grande podría sobrepasar tu cuota mensual de %d bytes."
@@ -4837,27 +4882,27 @@ msgid "Could not update message with new URI."
msgstr "No se pudo actualizar mensaje con nuevo URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Error de la BD al insertar la etiqueta clave: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
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 "
"minutos."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4865,21 +4910,21 @@ msgstr ""
"Muchos mensajes, enviados muy rápido; espera un poco e intenta publicar "
"pasados unos minutos."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4981,188 +5026,188 @@ msgid "Untitled page"
msgstr "Página sin título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea temporal de amistades"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conectar a los servicios"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Cambiar la configuración del sitio"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amistades y compañeros a unirse a tí en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Cerrar sesión en el sitio"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
-msgstr "Cerrar Sesión"
+msgstr "Cerrar sesión"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear una cuenta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar sesión en el sitio"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "¡Ayúdame!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Ayuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Aviso de sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Vistas locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Aviso de página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Ayuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Preguntas Frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacidad"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Fuente"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5172,13 +5217,13 @@ msgstr ""
"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** es un servicio de microblogueo."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5190,34 +5235,34 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "El contenido y datos de %1$s son privados y confidenciales."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
"derechos reservados."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5225,24 +5270,24 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Antes"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"A espera de un elemento de alimentación de raíz, pero se obtuvo un documento "
@@ -5252,11 +5297,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr "Aún no se puede manejar contenido remoto."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Aún no se puede manejar contenido XML incrustado."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Aún no se puede manejar contenido incrustado Base64."
@@ -5287,64 +5332,64 @@ msgid "Unable to delete design setting."
msgstr "No se puede eliminar la configuración de diseño."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configuración básica del sitio"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Sitio"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configuración del diseño"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Diseño"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Configuración de usuario"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuario"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Configuración de acceso"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configuración de rutas"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Configuración de sesiones"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Editar el aviso del sitio"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Configuración de instantáneas"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API requiere acceso de lectura y escritura, pero sólo tienes acceso de "
@@ -5477,11 +5522,11 @@ msgstr "Mensajes donde aparece este adjunto"
msgid "Tags for this attachment"
msgstr "Etiquetas de este archivo adjunto"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "El cambio de contraseña ha fallado"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "No está permitido cambiar la contraseña"
@@ -5564,9 +5609,9 @@ msgstr "No se pudo unir el usuario %s al grupo %s"
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
+msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5576,14 +5621,14 @@ msgstr "Nombre completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Lugar: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Página de inicio: %s"
@@ -6120,8 +6165,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ahora está escuchando tus avisos en %2$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Si crees que esta cuenta está siendo utilizada de forma abusiva, puedes "
+"bloquearla de tu lista de suscriptores y reportar la como cuenta no deseada "
+"a los administradores de sitios en %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6149,19 +6204,19 @@ msgstr ""
"Cambia tus preferencias de notificaciones a tu correo electrónico en %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nueva dirección de correo para postear a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6183,30 +6238,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS confirmación"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: Confirma que este es tu número de teléfono mediante este código:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te ha dado un toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6234,13 +6289,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuevo mensaje privado de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6274,13 +6329,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) agregó tu aviso como un favorito"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6318,7 +6373,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6329,13 +6384,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ha enviado un aviso a tu atención"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6398,7 +6453,7 @@ msgstr ""
"otros usuarios partícipes de la conversación. La gente puede enviarte "
"mensajes que sólo puedas leer tú."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "desde"
@@ -6559,23 +6614,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "en"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "en contexto"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetido por"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder este aviso."
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Aviso repetido"
@@ -6648,7 +6703,7 @@ msgstr "Mensajes enviados"
msgid "Tags in %s's notices"
msgstr "Etiquetas en avisos de %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Desconocido"
@@ -6685,7 +6740,7 @@ msgstr "Promedio diario"
msgid "All groups"
msgstr "Todos los grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método no implementado."
@@ -6709,7 +6764,7 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No hay respuesta a los argumentos."
@@ -6730,7 +6785,7 @@ msgstr "Responder este aviso."
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar el rol \"%s\" de este usuario"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ningún usuario sólo definido para modo monousuario."
@@ -6828,6 +6883,51 @@ msgstr "Nube de etiquetas de personas etiquetadas"
msgid "None"
msgstr "Ninguno"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr "Este servidor no puede manejar cargas de temas sin soporte ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Sudida del tema perdido o errado."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Grabado de tema errado."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Tema inválido: mala estructura de directorio."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Tema subido es demasiado grande; debe ser menor que %d bytes sin comprimir."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Archivo de tema inválido: archivo perdido css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"El tema contiene archivo o nombre de carpeta inválido. Restrínjase a letras "
+"ASCII, dígitos, carácter de subrayado, y signo menos."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "El tema contiene archivo de tipo '.%s', que no está permitido."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Error al abrir archivo de tema."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Principales posteadores"
@@ -6908,56 +7008,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "hace unos segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "hace un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "hace una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "hace un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "hace un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 300f8a602..22997fc91 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -1,6 +1,8 @@
# Translation of StatusNet to Persian
#
# Author@translatewiki.net: ArianHT
+# Author@translatewiki.net: Brion
+# Author@translatewiki.net: Choxos
# Author@translatewiki.net: Everplays
# Author@translatewiki.net: Narcissus
# --
@@ -10,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:42+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:35+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,29 +22,29 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "دسترسی"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
msgid "Site access settings"
-msgstr "تنظیمات دسترسی"
+msgstr "تنظیمات دسترسی وب‌گاه"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
msgid "Registration"
-msgstr "ثبت‌نام"
+msgstr "نام‌نویسی"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "از دیدن وب‌گاه توسط کاربران ناشناس (وارد نشده) جلوگیری شود؟"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
@@ -53,27 +55,27 @@ 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
msgid "Invite only"
-msgstr "Ùقط دعوت کردن"
+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
msgid "Closed"
-msgstr "مسدود"
+msgstr "بسته‌شده"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
msgid "Save access settings"
-msgstr "ذخیره‌ی تنظیمات دسترسی"
+msgstr "ذخیرهٔ تنظیمات دسترسی"
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
@@ -87,25 +89,24 @@ msgid "Save"
msgstr "ذخیره"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "چنین صÙحه‌ای وجود ندارد"
+msgstr "چنین صÙحه‌ای وجود ندارد."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -118,134 +119,134 @@ msgid "No such user."
msgstr "چنین کاربری وجود ندارد."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
-#, fuzzy, php-format
+#: actions/all.php:90
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s کاربران مسدود شده، صÙحه‌ی %d"
+msgstr "%1$s Ùˆ دوستان، صÙحهٔ %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s و دوستان"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "خوراک دوستان %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "خوراک دوستان %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "خوراک دوستان %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند."
+msgstr "این خط‌زمانی %s Ùˆ دوستانش است، اما هیچ‌یک تاکنون چیزی Ù†Ùرستاده‌اند."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
-"پیگیری اÙراد بیش‌تری بشوید [به یک گروه بپیوندید](%%action.groups%%) یا خودتان "
-"چیزی را ارسال کنید."
+"پیگیر اÙراد بیش‌تری بشوید [به یک گروه بپیوندید](%%action.groups%%) یا خودتان "
+"چیزی بÙرستید."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"می‌توانید از صÙحه‌ی شخصی‌اش به او [سقلمه](../%2$s) بزنید یا [چیزی بنویسید](%%%%"
-"action.newnotice%%%%?status_textarea=%3$s) تا توجه او را جذب کنید."
+"شما می‌توانید [یادآوری‌کردن %1$s](../%2$s) را از نمایه‌اش امتحان کنید یا [به "
+"توجه او چیزی بÙرستید](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
-"چرا [ثبت نام](%%%%action.register%%%%) نمی‌کنید Ùˆ سپس با Ùرستادن پیام توجه %s "
-"را جلب کنید."
+"چرا [ثبت‌نام](%%%%action.register%%%%) نمی‌کنید و سپس به %s یادآوری کنید یا یک "
+"پیام به توجه‌اش بÙرستید."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "شما و دوستان"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr "به روز رسانی از %1$ و دوستان در %2$"
+msgstr "به روز رسانی از %1$s و دوستان در %2$s"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "رابط مورد نظر پیدا نشد."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "برای استÙاده از این روش باید اطلاعات را به صورت پست بÙرستید"
-#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
-msgstr "شما باید یک پارامتر با نام device و مقدار sms، im یا none مشخص کنید."
+msgstr ""
+"شما باید یک پارامتر را به نام device و مقدار sms، im یا none مشخص کنید."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
@@ -257,15 +258,15 @@ msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
#: lib/profileaction.php:84
msgid "User has no profile."
-msgstr "کاربر هیچ شناس‌نامه‌ای ندارد."
+msgstr "کاربر هیچ نمایه‌ای ندارد."
#: actions/apiaccountupdateprofile.php:147
msgid "Could not save profile."
-msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
+msgstr "نمی‌توان نمایه را ذخیره کرد."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -323,43 +324,43 @@ msgstr "پیام‌های مستقیم به %s"
msgid "All the direct messages sent to %s"
msgstr "تمام پیام‌های مستقیم Ùرستاده‌شده به %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "هیچ پیام متنی وجود ندارد!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
-msgstr "این بسیار طولانی است. بیشینهٔ اندازهٔ پیام %d حر٠است."
+msgstr "این بسیار طولانی است. بیشینهٔ اندازهٔ پیام %d نویسه است."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "کاربر گیرنده یاÙت نشد."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "نمی‌توان پیام مستقیم را به کاربرانی Ú©Ù‡ دوست شما نیستند، Ùرستاد."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "هیچ وضعیتی با آن شناسه پیدا نشد."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
-msgstr "این پیغام را پیش‌تر به علایق خود اضاÙÙ‡ کرده‌اید"
+msgstr "این پیغام را پیش‌تر به برگزیده‌های خود اضاÙÙ‡ کرده‌اید"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
-msgstr "نمی‌توان وضعیت را موردعلاقه کرد."
+msgstr "نمی‌توان پیام را برگزید."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
-msgstr "این پیغام جزو علایق شما نیست"
+msgstr "این پیام یک پیام برگزیده نیست."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
-msgstr "نمی‌توان وضعیت موردعلاقه را حذ٠کرد."
+msgstr "نمی‌توان پیام برگزیده را حذ٠کرد."
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
@@ -390,144 +391,142 @@ msgstr "نمی‌توان کاربر منبع را تعیین کرد."
msgid "Could not find target user."
msgstr "نمی‌توان کاربر هد٠را پیدا کرد."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "لقب باید شامل حرو٠کوچک Ùˆ اعداد Ùˆ بدون Ùاصله باشد."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "این لقب در حال حاضر ثبت شده است. لطÙا یکی دیگر انتخاب کنید."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "لقب نا معتبر."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
-msgstr "برگهٔ آغازین یک نشانی معتبر نیست."
+msgstr "صÙحهٔ خانگی یک نشانی معتبر نیست."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
-msgstr "نام کامل طولانی است (۲۵۵ حر٠در حالت بیشینه(."
+msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "توصی٠بسیار زیاد است (حداکثر %d حرÙ)."
+msgstr "توصی٠خیلی طولانی است (حداکثر %d نویسه)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
-msgstr "مکان طولانی است (حداکثر Û²ÛµÛµ حرÙ)"
+msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "نام‌مستعار غیر مجاز: «%s»"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "نام‌مستعار «%s» ازپیش گرÙته‌شده‌است. یکی دیگر را امتحان کنید."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "گروه یاÙت نشد!"
+msgstr "گروه یاÙت نشد."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "شما از پیش یک عضو این گروه هستید."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود."
+msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "شما یک عضو این گروه نیستید."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "گروه‌های %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "هست عضو %s گروه"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s گروه"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "گروه‌ها در %s"
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "هیچ پارامتر oauth_token آماده نشده است."
#: actions/apioauthauthorize.php:106
-#, fuzzy
msgid "Invalid token."
-msgstr "اندازه‌ی نادرست"
+msgstr "رمز نامعتبر است."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -536,17 +535,16 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "مشکلی در دریاÙت جلسه‌ی شما وجود دارد. لطÙا بعدا سعی کنید."
#: actions/apioauthauthorize.php:135
-#, fuzzy
msgid "Invalid nickname / password!"
-msgstr "نام کاربری یا کلمه ی عبور نا معتبر."
+msgstr "نام کاربری یا گذرواژه نامعتبر است!"
#: actions/apioauthauthorize.php:159
msgid "Database error deleting OAuth application user."
-msgstr ""
+msgstr "هنگام حذÙ‌کردن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
#: actions/apioauthauthorize.php:185
msgid "Database error inserting OAuth application user."
-msgstr ""
+msgstr "هنگام اÙزودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
#: actions/apioauthauthorize.php:214
#, php-format
@@ -554,11 +552,12 @@ msgid ""
"The request token %s has been authorized. Please exchange it for an access "
"token."
msgstr ""
+"نشانهٔ درخواست %s تایید شد. لطÙا آن را برای یک نشانهٔ دسترسی مبادله کنید."
#: actions/apioauthauthorize.php:227
#, php-format
msgid "The request token %s has been denied and revoked."
-msgstr ""
+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.
@@ -574,11 +573,11 @@ msgstr "ارسال غیر قابل انتظار Ùرم."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "یک برنامه می‌خواهد که به حساب شما وصل شود"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "اجازه‌دادن (به) یا جلوگیری از دسترسی"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -587,14 +586,18 @@ msgid ""
"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
"give access to your %4$s account to third parties you trust."
msgstr ""
+"برنامهٔ <strong>%1$s</strong> نوشته شده توسط <strong>%2$s</strong> امکان "
+"<strong>%3$s</strong> داده‌های حساب %4$s شما را می‌خواهد. شما باید تنها اجازهٔ "
+"دسترسی به حساب %4$s خودتان را به برنامه‌های دیگری که به آن اعتماد دارید، "
+"بدهید."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "حساب کاربری"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -602,30 +605,28 @@ msgid "Nickname"
msgstr "نام کاربری"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "گذرواژه"
#: actions/apioauthauthorize.php:328
-#, fuzzy
msgid "Deny"
-msgstr "طرح"
+msgstr "رد کردن"
#: actions/apioauthauthorize.php:334
-#, fuzzy
msgid "Allow"
-msgstr "همه"
+msgstr "اجازه دادن"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "به دسترسی به اطلاعات حسابتان اجازه بدهید یا از آن جلوگیری کنید."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "این روش نیازمند POST یا DELETE است."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "شما توانایی حذ٠وضعیت کاربر دیگری را ندارید."
@@ -636,65 +637,65 @@ msgstr "چنین پیامی وجود ندارد."
#: actions/apistatusesretweet.php:83
msgid "Cannot repeat your own notice."
-msgstr "نمی توانید خبر خود را تکرار کنید."
+msgstr "نمی توانید پیام خود را تکرار کنید."
#: actions/apistatusesretweet.php:91
msgid "Already repeated that notice."
-msgstr "ابن خبر قبلا Ùرستاده شده"
+msgstr "قبلا آن پیام تکرار شده است."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "وضعیت حذ٠شد."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "هیچ وضعیتی با آن شناسه یاÙت نشد."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حر٠است."
+msgstr "این خیلی طولانی است. بیشینهٔ طول پیام %d نویسه است."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "یاÙت نشد."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr "حداکثر طول پیام %d حر٠است که شامل ضمیمه نیز می‌باشد"
+msgstr "بیشینهٔ طول پیام %d نویسه که شامل نشانی اینترنتی پیوست هم هست."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
msgstr "قالب پشتیبانی نشده."
-#: actions/apitimelinefavorites.php:109
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:110
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / دوست داشتنی از %s"
+msgstr "%1$s / برگزیده‌ها از %2$s"
-#: actions/apitimelinefavorites.php:118
-#, fuzzy, php-format
+#: actions/apitimelinefavorites.php:119
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
+msgstr "به‌روزرسانی‌های %1$s که توسط %2$s برگزیده شده اند / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%$1s / به روز رسانی های شامل %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s خط‌زمانی عمومی"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s به روز رسانی های عموم"
@@ -702,19 +703,19 @@ msgstr "%s به روز رسانی های عموم"
#: actions/apitimelineretweetedtome.php:111
#, php-format
msgid "Repeated to %s"
-msgstr ""
+msgstr "تکرار شده به %s"
#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "تکرار %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
@@ -728,7 +729,7 @@ msgstr "چنین پیوستی وجود ندارد."
#: actions/grouplogo.php:86 actions/groupmembers.php:76
#: actions/grouprss.php:91 actions/showgroup.php:121
msgid "No nickname."
-msgstr "بدون لقب."
+msgstr "لقبی وجود ندارد."
#: actions/avatarbynickname.php:64
msgid "No size."
@@ -753,9 +754,8 @@ msgstr ""
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
msgid "User without matching profile."
-msgstr "کاربر بدون مشخصات"
+msgstr "کاربر نمایهٔ تطبیق ندارد."
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:254
@@ -773,7 +773,7 @@ msgid "Preview"
msgstr "پیش‌نمایش"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "حذÙ"
@@ -786,9 +786,8 @@ msgid "Crop"
msgstr "برش"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "کاربری مشخص نشده است."
+msgstr "هیچ پرونده‌ای بارگذاری نشد."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -814,11 +813,11 @@ msgstr "چهره پاک شد."
msgid "You already blocked that user."
msgstr "شما هم اکنون آن کاربر را مسدود کرده اید."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "مسدود کردن کاربر"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -834,17 +833,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "خیر"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "کاربر را مسدود نکن"
@@ -853,22 +851,21 @@ msgstr "کاربر را مسدود نکن"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "بله"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "کاربر را مسدود کن"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
-msgstr ""
+msgstr "ذخیرهٔ ردی٠اطلاعات شکست خورد."
#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
@@ -887,12 +884,12 @@ msgstr "چنین گروهی وجود ندارد."
#: actions/blockedfromgroup.php:97
#, php-format
msgid "%s blocked profiles"
-msgstr "%s کاربران مسدود شده"
+msgstr "%s نمایه‌های مسدود شده"
#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s کاربران مسدود شده، صÙحه‌ی %d"
+msgstr "%1$s نمایه‌های مسدود شده، صÙحهٔ %2$d"
#: actions/blockedfromgroup.php:115
msgid "A list of the users blocked from joining this group."
@@ -912,9 +909,9 @@ msgstr "آزاد سازی کاربر"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "ارسال به "
+msgstr "Ùرستادن به %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -930,9 +927,9 @@ msgstr "آن کد تصدیق برای شما نیست!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "نوع نشانی نامشخص است %s"
+msgstr "نوع نشانی نامشخص است %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -961,7 +958,6 @@ msgid "Couldn't delete email confirmation."
msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
#: actions/confirmaddress.php:146
-#, fuzzy
msgid "Confirm address"
msgstr "تایید نشانی"
@@ -980,53 +976,47 @@ msgid "Notices"
msgstr "پیام‌ها"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "برای ویرایش گروه باید وارد شوید."
+msgstr "برای پاک‌کردن یک برنامه باید وارد شده باشید."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "ابن خبر ذخیره ای ندارد ."
+msgstr "برنامه یاÙت نشد."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
-#, fuzzy
msgid "You are not the owner of this application."
-msgstr "شما یک عضو این گروه نیستید."
+msgstr "شما مالک این برنامه نیستید."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
-msgstr ""
+msgstr "یک مشکل با رمز نشست شما وجود داشت."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "چنین پیامی وجود ندارد."
+msgstr "حذ٠برنامه"
#: actions/deleteapplication.php:149
-#, fuzzy
msgid ""
"Are you sure you want to delete this application? This will clear all data "
"about the application from the database, including all existing user "
"connections."
msgstr ""
-"آیا مطمئن هستید که می‌خواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات "
-"پاک و بدون برگشت خواهند بود."
+"آیا مطمئن هستید که می‌خواهید این برنامه را حذ٠کنید؟ این تمام داده‌ها را "
+"دربارهٔ برنامه از پایگاه‌داده پاک می‌کند که شامل تمام اتصال‌های کاربری موجود "
+"می‌شود."
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "این پیام را پاک نکن"
+msgstr "این برنامه حذ٠نشود"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
-#, fuzzy
msgid "Delete this application"
-msgstr "این پیام را پاک کن"
+msgstr "این برنامه حذ٠شود"
#. 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
@@ -1034,7 +1024,7 @@ msgstr "این پیام را پاک کن"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "شما به سیستم وارد نشده اید."
@@ -1065,7 +1055,7 @@ msgid "Do not delete this notice"
msgstr "این پیام را پاک نکن"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "این پیام را پاک کن"
@@ -1103,47 +1093,56 @@ msgstr "طرح"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site."
-msgstr "تنظیمات ظاهری برای این سایت."
+msgstr "تنظیمات ظاهری برای این وب‌گاه StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "نشانی اینترنتی نشان نامعتبر است."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "پوسته در دسترس نمی‌باشد: %s"
+msgstr "پوسته در دسترس نیست: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "تغییر نشان"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "نشان وب‌گاه"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "تغییر پوسته"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "پوستهٔ وب‌گاه"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "پوسته برای وب‌گاه"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "پوستهٔ وب‌گاه"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغییر تصویر پیش‌زمینه"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "پیش‌زمینه"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1153,57 +1152,65 @@ msgstr ""
"پرونده %1 $s است."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "روشن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "خاموش"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "تصویر پیش‌زمینه را Ùعال یا غیرÙعال کنید."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "تصویر پیش‌زمینهٔ موزاییکی"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
-msgstr "عوض‌کردن رنگ‌ها"
+msgstr "تغییر رنگ‌ها"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "محتوا"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "ستون کناری"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "متن"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "پیوندها"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استÙاده‌کردن از پیش‌Ùرض‌ها"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "بازگرداندن طرح‌های پیش‌Ùرض"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "برگشت به حالت پیش گزیده"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1213,17 +1220,17 @@ msgstr "برگشت به حالت پیش گزیده"
msgid "Save"
msgstr "ذخیره‌کردن"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "ذخیره‌کردن طرح"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr "این آگهی یک آگهی برگزیده نیست!"
+msgstr "این پیام یک پیام برگزیده نیست!"
#: actions/disfavor.php:94
msgid "Add to favorites"
-msgstr "اÙزودن به علاقه‌مندی‌ها"
+msgstr "اÙزودن به برگزیده‌ها"
#: actions/doc.php:158
#, fuzzy, php-format
@@ -1231,65 +1238,57 @@ msgid "No such document \"%s\""
msgstr "چنین سندی وجود ندارد."
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "انتخابات دیگر"
+msgstr "ویرایش برنامه"
#: actions/editapplication.php:66
-#, fuzzy
msgid "You must be logged in to edit an application."
-msgstr "برای ویرایش گروه باید وارد شوید."
+msgstr "برای ویرایش یک برنامه باید وارد شده باشید."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
-#, fuzzy
msgid "No such application."
-msgstr "چنین پیامی وجود ندارد."
+msgstr "چنین برنامه‌ای وجود ندارد."
#: actions/editapplication.php:161
-#, fuzzy
msgid "Use this form to edit your application."
-msgstr "از این روش برای ویرایش گروه استÙاده کنید."
+msgstr "از این روش برای ویرایش برنامه‌تان استÙاده کنید."
#: actions/editapplication.php:177 actions/newapplication.php:159
msgid "Name is required."
-msgstr ""
+msgstr "نام مورد نیاز است."
#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
msgid "Name is too long (max 255 chars)."
-msgstr "نام کامل طولانی است (۲۵۵ حر٠در حالت بیشینه(."
+msgstr "نام خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
-msgstr "این لقب در حال حاضر ثبت شده است. لطÙا یکی دیگر انتخاب کنید."
+msgstr "این نام در حال حاضر مورد استÙاده است. یکی دیگر را بیازمایید."
#: actions/editapplication.php:186 actions/newapplication.php:168
msgid "Description is required."
-msgstr ""
+msgstr "توصی٠مورد نیاز است."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "نشانی اینترنتی منبع بسیار بلند است."
#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
msgid "Source URL is not valid."
-msgstr "برگهٔ آغازین یک نشانی معتبر نیست."
+msgstr "نشانی اینترنتی منبع معتبر نیست."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "سازمانی‌دهی مورد نیاز است."
#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
msgid "Organization is too long (max 255 chars)."
-msgstr "مکان طولانی است (حداکثر Û²ÛµÛµ حرÙ)"
+msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "صÙحهٔ‌خانگی سازمان مورد نیاز است."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
@@ -1300,9 +1299,8 @@ msgid "Callback URL is not valid."
msgstr ""
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+msgstr "نمی‌توان برنامه را به‌هنگام‌سازی کرد."
#: actions/editgroup.php:56
#, php-format
@@ -1315,9 +1313,8 @@ msgstr "برای ساخت یک گروه، باید وارد شده باشید."
#: actions/editgroup.php:107 actions/editgroup.php:172
#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "برای ویرایش گروه، باید یک مدیر باشید."
+msgstr "برای ویرایش گروه باید یک مدیر باشید."
#: actions/editgroup.php:158
msgid "Use this form to edit the group."
@@ -1326,7 +1323,7 @@ msgstr "از این روش برای ویرایش گروه استÙاده Ú©Ù†ÛŒØ
#: actions/editgroup.php:205 actions/newgroup.php:145
#, php-format
msgid "description is too long (max %d chars)."
-msgstr "توصی٠بسیار زیاد است (حداکثر %d حرÙ)."
+msgstr "توصی٠خیلی طولانی است (حداکثر %d نویسه)"
#: actions/editgroup.php:228 actions/newgroup.php:168
#, php-format
@@ -1347,7 +1344,6 @@ msgstr "گزینه‌ها ذخیره شدند."
#. TRANS: Title for e-mail settings.
#: actions/emailsettings.php:61
-#, fuzzy
msgid "Email settings"
msgstr "تنظیمات پست الکترونیک"
@@ -1361,9 +1357,8 @@ msgstr "چگونگی دریاÙت نامه از %%site.name%% را اداره Ú©
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
msgid "Email address"
-msgstr "نشانی‌های پست الکترونیکی"
+msgstr "نشانی پست الکترونیک"
#. TRANS: Form note in e-mail settings form.
#: actions/emailsettings.php:112
@@ -1378,7 +1373,6 @@ msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "حذÙ"
@@ -1388,6 +1382,8 @@ msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
+"در حال انتظار برای تایید این نشانی. صندوق ورودی (و صندوق هرزنامه!) خود را "
+"برای یک پیام با راهنمایی‌های بیش‌تر بررسی کنید."
#. TRANS: Button label to cancel an e-mail address confirmation procedure.
#. TRANS: Button label to cancel an IM address confirmation procedure.
@@ -1395,7 +1391,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "انصراÙ"
@@ -1410,7 +1405,6 @@ msgstr "نشانی پست الکترونیکی، مانند «UserName@example.o
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "اÙزودن"
@@ -1425,27 +1419,26 @@ msgstr "پست الکترونیک ورودی"
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
-msgstr "برای ارسال پیام با استÙاده از پست الکترونیک به این نشانی نامه بÙرستید."
+msgstr ""
+"برای Ùرستادن پیام با استÙاده از پست الکترونیک به این نشانی نامه بÙرستید."
#. TRANS: Instructions for incoming e-mail address input form.
#. TRANS: Instructions for incoming SMS e-mail address input form.
#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
-msgstr "نشانی جدید برای ارسال پیام ایجاد کن؛ نشانی قبلی Ùسخ می‌شود."
+msgstr "نشانی جدید برای Ùرستادن پیام ایجاد کن؛ نشانی قبلی لغو می‌شود."
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
-msgstr "جدید"
+msgstr "تازه"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "ترجیحات"
+msgstr "ترجیحات پست الکترونیکی"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1456,7 +1449,7 @@ msgstr "پیام‌های کسانی را Ú©Ù‡ به تازگی دنبال Ù…ÛŒâ€
#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-"هر وقت کسی پیام های مرا دوست داشتنی کرد، مرا با پست اکترونیک با خبر کن."
+"هرگاه کسی پیام من را به عنوان برگزیده اضاÙÙ‡ کرد، به من نامه Ùرستاده شود."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:193
@@ -1466,17 +1459,18 @@ msgstr "هر وقت کسی برای من پیام خصوصی Ùرستاد، مر
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "هر وقت کسی از من در پیام خود یاد کرد، مرا با پست الکترونیک با خبر کن."
+msgstr "هرگاه کسی به من یک «@-پاسخ» می‌Ùرستد، به من نامه بÙرست."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
-msgstr "اجازه بده دوستان توجه مرا جذب کنند Ùˆ به من نامه بÙرستند."
+msgstr ""
+"به دوستان اجازه داده شود Ú©Ù‡ به من یادآوری کنند Ùˆ یک نامه به من بÙرستند."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:212
msgid "I want to post notices by email."
-msgstr "می‌خواهم با نامه پیام ارسال کنم."
+msgstr "می‌خواهم با نامه پیام بÙرستم."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:219
@@ -1485,9 +1479,8 @@ msgstr "یک شناسه برای پست الکترونیک من منتشر کن
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "ترجیحات طرح ذخیره شد."
+msgstr "ترجیحات پست الکترونیکی ذخیره شد."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1500,10 +1493,10 @@ msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
-msgstr "یک آدرس ایمیل معتبر نیست."
+msgstr "یک نشانی پست الکترونیکی معتبر نیست."
#. TRANS: Message given saving e-mail address that is already set.
#: actions/emailsettings.php:370
@@ -1529,8 +1522,8 @@ msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-"کد تایید به نشانی شما ارسال شد. نامه های خود را بررسی کنید برای کد تایید و "
-"راه استÙاده."
+"کد تایید به نشانی شما Ùرستاده شد. صندوق ورودی (Ùˆ صندوق هرزنامه‌تان!) را برای "
+"کد Ùˆ راهنمای استÙادهٔ آن بررسی کنید."
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
@@ -1542,15 +1535,13 @@ msgstr "هیچ تاییدی برای Ùسخ کردن وجود ندارد."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "نشانی پیام رسان اشتباه است."
+msgstr "این نشانی پست الکترونیکی نادرست است."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "تایید Ùسخ شد."
+msgstr "تایید پست الکترونیکی لغو شد."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1560,9 +1551,8 @@ msgstr "آن نشانی شما نیست."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "نشانی پاک شده است."
+msgstr "نشانی پست الکترونیکی پاک شده است."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1587,38 +1577,39 @@ msgstr "نشانی ورودی جدید اضاÙÙ‡ شد."
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr "این پیام هم اکنون دوست داشتنی شده است."
+msgstr "این پیام ازقبل برگزیده شده است!"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
-msgstr "دوست ندارم"
+msgstr "خارج‌کردن از برگزیده‌ها"
#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
-msgstr "آگهی‌های محبوب"
+msgstr "پیام‌های برگزیده"
#: actions/favorited.php:67
#, php-format
msgid "Popular notices, page %d"
-msgstr "آگهی‌های محبوب، صÙحهٔ %d"
+msgstr "پیام‌های برگزیده، صÙحهٔ %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "دوست داشتنی ترین پیام های سایت در حال حاضر."
+msgstr "محبوب‌ترین پیام‌هایی که اکنون در این وب‌گاه هستند."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
-"پیام‌های دوست داشتنی در این صÙحه نمایش داده می‌شوند اما هیچ کس پیامی را دوست "
-"داشتنی نکرده است."
+"پیام‌های برگزیده در این صÙحه نشان داده می‌شوند، ولی هنوز کسی چیزی را برنگزیده "
+"است."
#: actions/favorited.php:153
msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr ""
-"یک پیام را دوست داشتنی کنید با کلیک کردن روی دکمه‌ی دوست داشتنی نزدیک هر پیام."
+"با کلیک کردن روی دکمهٔ برگزیده کنار هر پیامی Ú©Ù‡ می‌خواهید، اولین Ù†Ùری باشید Ú©Ù‡ "
+"یک پیام را به برگزیده‌هایش اضاÙÙ‡ می‌کند."
#: actions/favorited.php:156
#, php-format
@@ -1626,13 +1617,14 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
-"چرا [ثبت نام](%%action.register%%) نمی‌کنید و یک پیام را دوست داشتنی کنید؟"
+"چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید Ùˆ اولین Ù†Ùری "
+"باشید Ú©Ù‡ یک پیام را به برگزیده‌هایش اضاÙÙ‡ می‌کند!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr "دوست داشتنی های %s"
+msgstr "پیام‌های برگزیدهٔ %s"
#: actions/favoritesrss.php:115
#, php-format
@@ -1652,27 +1644,27 @@ msgstr "کاربران ویژه، صÙحه‌ی %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "یک انتخاب از برخی از کاربران مهم در %s"
#: actions/file.php:34
msgid "No notice ID."
-msgstr ""
+msgstr "هیچ شناسهٔ پیامی وجود ندارد."
#: actions/file.php:38
msgid "No notice."
-msgstr "بدون آگهی."
+msgstr "هیچ پیامی وجود ندارد."
#: actions/file.php:42
msgid "No attachments."
-msgstr "بدون ضمیمه."
+msgstr "هیچ پیوستی وجود ندارد."
#: actions/file.php:51
msgid "No uploaded attachments."
-msgstr "بدون ضمیمه های ارسال شده."
+msgstr "هیچ پیوست بارگذاری شده‌ای وجود ندارد."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
-msgstr "انتظار چنین جوابی وجود نداشت!"
+msgstr "انتظار چنین واکنشی وجود نداشت!"
#: actions/finishremotesubscribe.php:80
msgid "User being listened to does not exist."
@@ -1699,9 +1691,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "خدمات مورد نظر از نسخه‌ی نا Ù…Ùهومی از قرارداد OMB استÙاده می‌کند."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "اشکال در به روز کردن کاربر دوردست."
+msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
#: actions/getfile.php:79
msgid "No such file."
@@ -1712,33 +1703,30 @@ msgid "Cannot read file."
msgstr "نمی‌توان پرونده را خواند."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "اندازه‌ی نادرست"
+msgstr "وظیÙÙ‡ نامعتبر است."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "این نقش از قبل تعیین شده است و نمی‌تواند کارگذاشته شود."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "شما نمی توانید کاربری را در این سایت ساکت کنید."
+msgstr "شما نمی‌توانید در این وب‌گاه نقش‌های کاربری را اهدا کنید."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "کاربر قبلا ساکت شده است."
+msgstr "کاربر از قبل این وظیÙÙ‡ را داشته است."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
-msgstr "کاربری مشخص نشده است."
+msgstr "نمایه‌ای مشخص نشده است."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
@@ -1761,25 +1749,28 @@ msgstr "کاربر عضو گروه نیست."
#: actions/groupblock.php:134 actions/groupmembers.php:360
msgid "Block user from group"
-msgstr "دسترسی کاربر به گروه را مسدود کن"
+msgstr "دسترسی کاربر به گروه مسدود شود"
#: actions/groupblock.php:160
-#, fuzzy, php-format
+#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
-msgstr "آیا مطمئن هستید می‌خواهید دسترسی »%s« را به گروه »%s« مسدود کنید؟"
+msgstr ""
+"آیا مطمئن هستید که می‌خواهید مانع دسترسی «%1$s» به گروه «%2$s» بشوید؟ آن‌ها از "
+"گروه حذ٠خواهند شد، نمی‌توانند چیزی به گروه بÙرستند Ùˆ نمی‌توانند Ú©Ù‡ در آینده "
+"مشترک گروه شوند."
#. TRANS: Submit button title for 'No' when blocking a user from a group.
#: actions/groupblock.php:182
msgid "Do not block this user from this group"
-msgstr "دسترسی کاربر به گروه را مسدود نکن"
+msgstr "دسترسی کاربر به گروه مسدود نشود"
#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
#: actions/groupblock.php:189
msgid "Block this user from this group"
-msgstr "دسترسی کاربر را به گروه مسدود کن"
+msgstr "دسترسی کاربر به گروه مسدود شود"
#: actions/groupblock.php:206
msgid "Database error blocking user from group."
@@ -1787,7 +1778,7 @@ msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
#: actions/groupbyid.php:74 actions/userbyid.php:70
msgid "No ID."
-msgstr ""
+msgstr "هیچ ID وجود ندارد."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
@@ -1832,7 +1823,7 @@ msgstr "نشان به‌هنگام‌سازی شد."
#: actions/grouplogo.php:401
msgid "Failed updating logo."
-msgstr "اشکال در ارسال نشان."
+msgstr "به‌هنگام‌سازی نشان شکست خورد."
#: actions/groupmembers.php:100 lib/groupnav.php:92
#, php-format
@@ -1840,9 +1831,9 @@ msgid "%s group members"
msgstr "اعضای گروه %s"
#: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "اعضای گروه %sØŒ صÙحهٔ %d"
+msgstr "اعضای گروه %1$sØŒ صÙحهٔ %2$d"
#: actions/groupmembers.php:118
msgid "A list of the users in this group."
@@ -1872,7 +1863,7 @@ msgstr "این کاربر یک مدیر شود"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "خط زمانی %s"
@@ -1902,11 +1893,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
-"گروه های %%%site.name%%% به شما اجازه می‌دهد با کسانی که همانند شما علاقه‌مندی "
-"های خاصی دارد صحبت کنید. بعد از پیوستن به یک گروه می‌توانید به شکل !groupname "
-"به اعضای آن گروه پیام ارسال کنید .گروهی که دوست دارید را نمی‌بینید؟ می‌توانید "
-"برای یاÙتن آن [بگردید](%%%action.groupsearch%%%) یا آن را خودتان [ایجاد](%%%"
-"action.newgroup%%%) کنید."
+"گروه‌های %%%site.name%%% به شما اجازه می‌دهد با کسانی که همانند شما "
+"علاقه‌مندی‌های خاصی دارد صحبت کنید. بعد از پیوستن به یک گروه می‌توانید به شکل !"
+"groupname به تمام اعضای دیگر گروه پیام بÙرستید. گروهی را Ú©Ù‡ دوست دارید، "
+"نمی‌بینید؟ می‌توانید برای یاÙتن آن [بگردید](%%%action.groupsearch%%%) !یا [آن "
+"را خودتان بسازید] (%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1917,7 +1908,9 @@ msgstr "یک گروه جدید بساز"
msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
-msgstr "با وارد کردن ۳ حر٠و بیش‌تر در گروه‌های %%site.name%% جست‌و‌جو کنید."
+msgstr ""
+"برای جست‌وجوی گروه‌ها در %%site.name%% از نام، مکان یا توصیÙ‌شان استÙاده کنید. "
+"عبارت‌ها را با Ùاصله جدا کنید؛ آن‌ها باید Û³ نویسه یا بیش‌تر باشند."
#: actions/groupsearch.php:58
msgid "Group search"
@@ -1926,7 +1919,7 @@ msgstr "جست‌وجوی گروه"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
msgid "No results."
-msgstr "بدون نتیجه."
+msgstr "نتیجه‌ای وجود ندارد."
#: actions/groupsearch.php:82
#, php-format
@@ -1960,7 +1953,6 @@ msgstr "اشکال در پاکسازی"
#. TRANS: Title for instance messaging settings.
#: actions/imsettings.php:60
-#, fuzzy
msgid "IM settings"
msgstr "تنظیمات پیام‌رسان Ùوری"
@@ -1984,7 +1976,6 @@ msgstr "پیام‌رسان Ùوری در دسترس نیست."
#. TRANS: Form legend for IM settings form.
#. TRANS: Field label for IM address input in IM settings form.
#: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
msgid "IM address"
msgstr "نشانی پیام‌رسان Ùوری"
@@ -2016,25 +2007,23 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "ترجیحات"
+msgstr "ترجیحات پیام‌رسان Ùوری"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
-msgstr "آگهی‌ها را از راه Jabber/GTalk برای من بÙرست."
+msgstr "پیام‌ها را از راه Jabber/GTalk برای من بÙرست."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "هر وقت Ú©Ù‡ وضعیت Jabber/Gtalk من Ùرق کرد، یک پیام ارسال Ú©Ù†."
+msgstr "هر وقت Ú©Ù‡ وضعیت Jabber/Gtalk من تغییر کرد، یک پیام بÙرست."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"جواب کسانی که من آن ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم ارسال کن."
+msgstr "پاسخ کسانی Ú©Ù‡ من آن‌ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم بÙرست."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:179
@@ -2069,7 +2058,7 @@ msgstr "این شناسه Jabber کنونی شماست."
#. TRANS: Message given saving IM address that is already set for another user.
#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
-msgstr "شناسه Jabber به یک کاربر دیگر مربوط است."
+msgstr "شناسهٔ Jabber به یک کاربر دیگر مربوط است."
#. TRANS: Message given saving valid IM address that is to be confirmed.
#. TRANS: %s is the IM address set for the site.
@@ -2079,8 +2068,8 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"کد تایید به پیام‌رسان شما ارسال شد. شما باید %s را تایید کنید تا پیام‌ها به "
-"شما ارسال شود."
+"یک کد تایید به نشانی پیام‌رسانی Ú©Ù‡ اضاÙÙ‡ کرده‌اید، Ùرستاده شد. شما باید %s را "
+"برای Ùرستادن پیام به شما، تایید کنید."
#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
#: actions/imsettings.php:388
@@ -2089,15 +2078,13 @@ msgstr "نشانی پیام رسان اشتباه است."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
+msgstr "نمی‌توان تایید پیام‌رسان Ùوری را پاک کرد."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "تایید Ùسخ شد."
+msgstr "تایید پیام‌رسان Ùوری لغو شد."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2107,14 +2094,13 @@ msgstr "این شناسه‌ی Jabber شما نیست."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "نشانی پاک شده است."
+msgstr "نشانی پیام‌رسان Ùوری پاک شده است."
#: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr "صندوق ورودی %s"
+msgstr "صندوق ورودی %1$s - صÙحهٔ %2$d"
#: actions/inbox.php:62
#, php-format
@@ -2127,12 +2113,12 @@ msgstr "این صندوق ورودی‌های شماست که پیام‌های
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr "دعوت‌کردن از کار انداخته شده‌است."
+msgstr "دعوت‌کردن از کار انداخته شده است."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "شما برای دعوت دیگران برای استÙاده از %s باید وارد شودید."
+msgstr "شما برای دعوت دیگران به استÙاده از %s باید وارد شده باشید."
#: actions/invite.php:72
#, php-format
@@ -2149,14 +2135,14 @@ msgstr "دعوت کردن کاربران تازه"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: "
+msgstr "شما هم‌اکنون مشترک این کاربران هستید:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
#: actions/invite.php:136
msgid ""
@@ -2172,8 +2158,8 @@ msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr ""
-"هر زمان که دعوت شدگان شما دعوتتان را بپذیرند شما با خبر خواهید شد. با تشکر "
-"از شما برای بزرگ کردن اجتماع کابران."
+"هر زمان که دعوت‌شدگان شما دعوت‌تان را بپذیرند، شما باخبر خواهید شد. از شما "
+"برای رشد اجتماع کاربران تشکر می‌کنیم!"
#: actions/invite.php:162
msgid ""
@@ -2195,11 +2181,10 @@ msgstr "پیام خصوصی"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr "اگر دوست دارید می‌توانید یک پیام به همراه دعوت نامه ارسال کنید."
+msgstr "در صورت تمایل می‌توانید یک پیام به همراه دعوت نامه بÙرستید."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Ùرستادن"
@@ -2241,22 +2226,48 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"%1$s شما را دعودت کرده است تا به آن‌ها در %2$s (%3$s) بپیوندید.\n"
+"\n"
+"%2$s یک سرویس میکروبلاگینگ است که به شما امکان می‌دهد که با کسانی که می‌شناسید "
+"و کسانی که به شما توجه دارند، به‌روز بمانید.\n"
+"\n"
+"شما همچنین می‌توانید خبرهایی دربارهٔ خودتان، اÙکارتان Ùˆ یا زندگی‌تان با کسانی "
+"که شما را می‌شناسند، به صورت آنلاین به اشتراک بگذارید.همچنین این راهی خوب "
+"برای ملاقات اÙراد تازه‌ای است Ú©Ù‡ علاقه‌مندی‌هایتان را با آن‌ها به اشتراک "
+"می‌گذارید.\n"
+"\n"
+"%1$sÚ¯Ùته است:\n"
+"\n"
+"%4$s\n"
+"\n"
+"شما می‌توانید صÙحهٔ نمایهٔ %1$s' را در %2$s این‌جا ببینید:\n"
+"\n"
+"%5$s\n"
+"\n"
+"اگر شما دوست دارید که سرویس را آزمایش کنید، روی پیوند زیر برای قبول دعوت "
+"کلیک کنید.\n"
+"\n"
+"%6$s\n"
+"\n"
+"اگر چنین نیست، شما می‌توانید این پیام را نادیده بگیرید. از شما برای طاقت و "
+"وقت‌تان تشکر می‌کنیم.\n"
+"\n"
+"با تشکر، %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "بدون لقب."
+msgstr "نام‌مستعار یا شناسه‌ای وجود ندارد."
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "ملحق شدن به گروه"
+msgstr "%1$s به گروه %2$s پیوست"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -2269,106 +2280,103 @@ msgstr "شما یک کاربر این گروه نیستید."
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s گروه %s را ترک کرد."
+msgstr "%1$s گروه %2$s را ترک کرد"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "قبلا وارد شده"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
-msgstr "نام کاربری یا رمز عبور نادرست."
+msgstr "نام کاربری یا گذرواژه نادرست است."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
-msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
+msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ورود"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "ورود به وب‌گاه"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "مرا به یاد بسپار"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
-msgstr "رمز عبور خود را Ú¯Ù… یا Ùراموش کرده اید؟"
+msgstr "گذرواژهٔ خود را Ú¯Ù… یا Ùراموش کرده‌اید؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-"به دلایل امنیتی، لطÙا نام کاربری Ùˆ رمز عبور خود را قبل از تغییر تنظیمات "
+"به دلایل امنیتی، لطÙا نام کاربری Ùˆ گذرواژهٔ خود را قبل از تغییر تنظیمات "
"دوباره وارد نمایید."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "با نام‌کاربری و گذرواژه‌تان وارد شوید."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"با نام‌کاربری و گذزواژه‌ی خود وارد شوید. نام‌کاربری ندارید؟ یک نام‌کاربری [ثبت ]"
-"(%%action.register%%) کنید."
+"هنوز یک نام‌کاربری ندارید؟ یک حساب تازه [ثبت کنید](%%action.register%%)."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr "Ùقط یک مدیر می‌تواند کاربر دیگری را مدیر کند."
#: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s از قبل مدیر گروه %s بود."
+msgstr "%1$s از قبل مدیر گروه «%2$s» است."
#: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "نمی‌توان اطلاعات عضویت %s را در گروه %s به دست آورد."
+msgstr "نمی‌توان پیشینهٔ عضویت %1$s را در گروه %2$s به‌دست آورد."
#: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "نمی‌توان %s را مدیر گروه %s کرد."
+msgstr "نمی‌توان %1$s را یکی از مدیران گروه %2$s کرد."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "بدون وضعیت Ùعلی"
+msgstr "وضعیت Ùعلی وجود ندارد."
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "چنین پیامی وجود ندارد."
+msgstr "برنامهٔ تازه"
#: actions/newapplication.php:64
-#, fuzzy
msgid "You must be logged in to register an application."
-msgstr "برای ساخت یک گروه، باید وارد شده باشید."
+msgstr "برای ثبت یک برنامه باید وارد شده باشید."
#: actions/newapplication.php:143
-#, fuzzy
msgid "Use this form to register a new application."
-msgstr "از این Ùرم برای ساختن یک گروه جدید استÙاده کنید"
+msgstr "از این شیوه برای ساختن یک برنامهٔ تازه استÙاده کنید."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "نشانی اینترنتی منبع مورد نیاز است."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "نمی‌توان نام‌های مستعار را ساخت."
+msgstr "نمی‌توان برنامه را ساخت."
#: actions/newgroup.php:53
msgid "New group"
@@ -2389,7 +2397,7 @@ msgstr "شما نمی توانید به این کاربر پیام بÙرستیØ
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
#: lib/command.php:555
msgid "No content!"
-msgstr "بدون محتوا!"
+msgstr "محتوایی وحود ندارد!"
#: actions/newmessage.php:158
msgid "No recipient specified."
@@ -2405,21 +2413,21 @@ msgid "Message sent"
msgstr "پیام Ùرستاده‌شد"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
msgstr "پیام مستقیم به %s Ùرستاده شد."
#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
-msgstr "اشکال آژاکسی"
+msgstr "خطای آژاکس"
#: actions/newnotice.php:69
msgid "New notice"
-msgstr "آگهی جدید"
+msgstr "پیام جدید"
#: actions/newnotice.php:217
msgid "Notice posted"
-msgstr "Ø¢Ú¯Ù‡ÛŒ Ùرستاده‌شد."
+msgstr "پیام Ùرستاده‌شد."
#: actions/noticesearch.php:68
#, php-format
@@ -2427,8 +2435,8 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
-"جست‌و‌جوی متن پیام‌ها در %%site.name%%. هر شرط را با Ùاصله جدا کنید Ùˆ کمینه‌ی "
-"جست‌و‌جو باید ۳ حر٠باشد."
+"برای جست‌وجوی پیام‌ها در %%site.name%% از محتوایشان استÙاده کنید. عبارت‌ها را "
+"با Ùاصله جدا کنید؛ آن‌ها باید Û³ نویسه یا بیش‌تر باشند."
#: actions/noticesearch.php:78
msgid "Text search"
@@ -2471,87 +2479,84 @@ msgstr "پیام‌هایی Ú©Ù‡ با جست‌و‌جوی عبارت »%1$s« Ø
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
-"این کاربر اجازه‌ی سقلمه زدن را نداده است یا پست‌الکترونیک خود را تایید نکرده "
-"است."
+"این کاربر اجازه‌ی یادآوری‌کردن را نداده است یا پست‌الکترونیک خود را تایید یا "
+"تعیین نکرده است."
#: actions/nudge.php:94
msgid "Nudge sent"
-msgstr "Ùرتادن اژیر"
+msgstr "یادآوری Ùرستاده‌شد"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr "سقلمه Ùرستاده شد!"
+msgstr "یادآوری Ùرستاده‌شد!"
#: actions/oauthappssettings.php:59
-#, fuzzy
msgid "You must be logged in to list your applications."
-msgstr "برای ویرایش گروه باید وارد شوید."
+msgstr "برای Ùهرست‌کردن برنامه‌هایتان باید وارد شده باشید."
#: actions/oauthappssettings.php:74
-#, fuzzy
msgid "OAuth applications"
-msgstr "انتخابات دیگر"
+msgstr "برنامه‌های OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "برنامه‌هایی که ثبت کرده‌اید"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "برنامه‌های وصل‌شده"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "شما به برنامه‌های زیر اجازه داده‌اید که به حساب‌تان دسترسی پیدا کنند."
#: actions/oauthconnectionssettings.php:175
-#, fuzzy
msgid "You are not a user of that application."
-msgstr "شما یک کاربر این گروه نیستید."
+msgstr "شما یک کاربر این برنامه نیستید."
#: actions/oauthconnectionssettings.php:186
#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr ""
+msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "شما به هیچ برنامه‌ای اجازه نداده‌اید Ú©Ù‡ از حساب‌تان استÙاده کند."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
+"توسعه‌دهنده‌ها می‌توانند تنظیمات نام‌نویسی را برای برنامه‌هایشان ویرایش کنند "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "ابن خبر ذخیره ای ندارد ."
+msgstr "این پیام نمایه‌ای ندارد."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "وضعیت %1$s در %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "نوع محتوا "
+msgstr "نوع محتوای %s پشتیبانی نشده است."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "لطÙا تنها از نشانی‌های اینترنتی %s از راه HTTP ساده استÙاده کنید."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -2561,10 +2566,9 @@ msgstr "جست‌وجوی کاربران"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr "جست‌وجوی آگهی‌ها"
+msgstr "جست‌وجوی پیام‌ها"
#: actions/othersettings.php:60
-#, fuzzy
msgid "Other settings"
msgstr "تنظیمات دیگر"
@@ -2586,44 +2590,40 @@ msgstr "کوتاه‌کننده‌ی نشانی مورد استÙاده."
#: actions/othersettings.php:122
msgid "View profile designs"
-msgstr "نمایش طراحی های پروÙایل"
+msgstr "نمایش طراحی‌های نمایه"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr "نمایش یا عدم‌نمایش طراحی‌های کاربران."
+msgstr "نمایش دادن یا پنهان کردن طراحی‌های نمایه."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
msgstr "کوتاه کننده‌ی نشانی بسیار طولانی است (بیش‌تر از ÛµÛ° حرÙ)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "گروهی مشخص نشده است."
+msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "خبری مشخص نشده."
+msgstr "هیچ رمز ورودی مشخص نشده است."
#: actions/otp.php:90
msgid "No login token requested."
-msgstr ""
+msgstr "هیچ رمز ورودی درخواست نشده است."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "علامت بی اعتبار یا منقضی."
+msgstr "رمز ورود مشخص شده نامعتبر است."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "ورود به وب‌گاه"
+msgstr "رمز ورود منسوخ شده است."
#: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
msgid "Outbox for %1$s - page %2$d"
-msgstr "Ùرستاده‌های %s"
+msgstr "صندوق خروجی %1$s - صÙحهٔ %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2633,8 +2633,8 @@ msgstr "Ùرستاده‌های %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
-"این صندوق خروجی شماست، Ú©Ù‡ پیام های خصوصی Ùرستاده شده به وسیله ÛŒ شما را لیست "
-"می کند."
+"این صندوق خروجی شماست، Ú©Ù‡ پیام‌های خصوصی Ùرستاده شده به وسیلهٔ شما را Ùهرست "
+"می‌کند."
#: actions/passwordsettings.php:58
msgid "Change password"
@@ -2642,7 +2642,7 @@ msgstr "تغییر گذرواژه"
#: actions/passwordsettings.php:69
msgid "Change your password."
-msgstr "تغییر گذرواژه‌تان"
+msgstr "تغییر گذرواژهٔ شما"
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
@@ -2650,89 +2650,89 @@ msgstr "تغییر گذرواژه"
#: actions/passwordsettings.php:104
msgid "Old password"
-msgstr "گذرواژهٔ قدیمی"
+msgstr "گذرواژهٔ پیشین"
#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
-msgstr "گذرواژهٔ جدید"
+msgstr "گذرواژهٔ تازه"
#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "۶ نویسه یا بیش‌تر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "تایید"
#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
msgid "Same as password above"
-msgstr "مثل رمز عبور بالا"
+msgstr "مانند گذرواژهٔ بالا"
#: actions/passwordsettings.php:117
msgid "Change"
msgstr "تغییر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "گذرواژه‌ها مطابقت ندارند."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
-msgstr "گذرواژه قدیمی اشتباه است"
+msgstr "گذرواژه پیشین اشتباه است"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
-msgstr "خطا هنگام ذخیره ی کاربر؛ نا معتبر."
+msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
-msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد."
+msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "گذرواژه ذخیره شد."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "مسیر ها"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr "تنظیمات و نشانی محلی این سایت استاتوس‌نتی"
+msgstr "تنظیمات و نشانی محلی این وب‌گاه StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "شاخه‌ی پوسته‌ها خواندنی نیست: %s"
+msgstr "شاخه‌ی پوسته‌ها قابل خواندن نیست: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "شاخه‌ی چهره‌ها نوشتنی نیست: %s"
+msgstr "شاخه‌ی تصویر چهره‌ها قابل نوشتن نیست: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "شاخه‌ی پس زمینه‌ها نوشتنی نیست: %s"
+msgstr "شاخه‌ی پس زمینه‌ها قابل نوشتن نیست: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "پوشه‌ی تنظیمات محلی خواندنی نیست: %s"
+msgstr "پوشه‌ی تنظیمات محلی قابل خواندن نیست: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "کارگزار SSL نامعتبر است. بیشینهٔ طول نام ۲۵۵ نویسه است."
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
msgid "Site"
-msgstr "سایت"
+msgstr "وب‌گاه"
#: actions/pathsadminpanel.php:238
msgid "Server"
@@ -2740,7 +2740,7 @@ msgstr "کارگزار"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr ""
+msgstr "نام میزبان کارگزار وب‌گاه."
#: actions/pathsadminpanel.php:242
msgid "Path"
@@ -2756,15 +2756,15 @@ msgstr "نشانی تنظیمات محلی"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
-msgstr ""
+msgstr "مسیر پوشه برای زبان‌های محلی"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr ""
+msgstr "نشانی‌های تمیز"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "از نشانی‌های تمیز (خواناتر Ùˆ ماندگارتر در ذهن) استÙاده شود؟"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2788,7 +2788,7 @@ msgstr "چهره‌ها"
#: actions/pathsadminpanel.php:284
msgid "Avatar server"
-msgstr "کارگزار نیم‌رخ"
+msgstr "کارگزار چهره‌ها"
#: actions/pathsadminpanel.php:288
msgid "Avatar path"
@@ -2836,16 +2836,15 @@ msgstr "استÙاده از SSL"
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "زمان استÙاده از SSL"
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "SSL server"
-msgstr "کارگزار"
+msgstr "کارگزار SSL"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "کارگزار برای هدایت درخواست‌های SSL به"
#: actions/pathsadminpanel.php:352
msgid "Save paths"
@@ -2857,95 +2856,94 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"جست‌و‌جو اÙراد در %%site.name%% با نام، محل زندگی یا چیز‌هایی Ú©Ù‡ دوست دارند. "
-"عبارت‌ها را با Ùاصله از هم جدا کنید Ùˆ حداقل Û³ حر٠وارد کنید."
+"برای جست‌وجوی اÙراد در %%site.name%% از نام، مکان یا توصیÙ‌شان استÙاده کنید. "
+"عبارت‌ها را با Ùاصله جدا کنید؛ آن‌ها باید Û³ نویسه یا بیش‌تر باشند."
#: actions/peoplesearch.php:58
msgid "People search"
msgstr "جست‌وجوی کاربران"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "یک برچسب کاربری معتبر نیست: %s"
+msgstr "یک برچسب کاربری معتبر نیست: %s."
#: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "کاربران خود برچسب‌گذاری شده با %s - صÙحهٔ %d"
+msgstr "کاربران خود برچسب‌گذاری شده با %1$s - صÙحهٔ %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "محتوای آگهی نامعتبر"
+msgstr "محتوای پیام نامعتبر است."
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
+msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
#: actions/profilesettings.php:60
msgid "Profile settings"
-msgstr "تنظیمات شناس‌نامه"
+msgstr "تنظیمات نمایه"
#: actions/profilesettings.php:71
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"شما می‌توان اطلاعات شخصی خود را در این قسمت به روز کنید تا دیگران بیش‌تر در "
-"مورد شما بدانند."
+"شما می‌توانید نمایهٔ شخصی خود را در این بخش به‌هنگام‌سازی کنید تا دیگران بیش‌تر "
+"در مورد شما بدانند."
#: actions/profilesettings.php:99
msgid "Profile information"
-msgstr "اطلاعات شناس‌نامه"
+msgstr "اطلاعات نمایه"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "Û±-Û¶Û´ کاراکتر Ú©ÙˆÚ†Ú© یا اعداد، بدون نقطه گذاری یا Ùاصله"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "نام‌کامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "صÙحهٔ خانگی"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
-msgstr "نشانی اینترنتی صÙحهٔ خانگی، وبلاگ یا مشخصات کاربری‌تان در یک وب‌گاه دیگر"
+msgstr "نشانی اینترنتی صÙحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+msgstr "خودتان و علاقه‌مندی‌هایتان را در %d نویسه توصی٠کنید"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
-msgstr "خودتان و علایقتان را توصی٠کنید."
+msgstr "خودتان و علاقه‌مندی‌هایتان را توصی٠کنید"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "شرح‌حال"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "موقعیت"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "مکان کنونی من هنگام Ùرستادن پیام‌ها به اشتراک گذاشته شود"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2957,6 +2955,7 @@ msgstr "برچسب‌ها"
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"برچسب‌ها برای خودتان (حروÙØŒ اعداد، -ØŒ .ØŒ Ùˆ _) جدا شده با کاما- یا Ùاصله-"
#: actions/profilesettings.php:151
msgid "Language"
@@ -2972,17 +2971,18 @@ msgstr "منطقهٔ‌زمانی"
#: actions/profilesettings.php:162
msgid "What timezone are you normally in?"
-msgstr "شما معمولا در کدام منطقه ی زمانی هستید؟"
+msgstr "شما معمولا در کدام منطقهٔ زمانی هستید؟"
#: actions/profilesettings.php:167
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
+"به صورت خودکار مشترک هر کسی بشو که مشترک من می‌شود (بهترین برای غیر انسان‌ها)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr ""
+msgstr "شرح‌حال خیلی طولانی است (بیشینه %d نویسه)."
#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
msgid "Timezone not selected."
@@ -2990,7 +2990,7 @@ msgstr "منطقه‌ی زمانی انتخاب نشده است."
#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
-msgstr "کلام بسیار طولانی است( حداکثر ۵۰ کاراکتر)"
+msgstr "زبان بسیار طولانی است ( حداکثر ۵۰ نویسه)"
#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
@@ -2999,7 +2999,7 @@ msgstr "نشان نادرست »%s«"
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "نمی‌توان کاربر را برای اشتراک خودکار به‌هنگام‌سازی کرد."
#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
@@ -3007,7 +3007,7 @@ msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
-msgstr "نمی‌توان شناسه را ذخیره کرد."
+msgstr "نمی‌توان نمایه را ذخیره کرد."
#: actions/profilesettings.php:383
msgid "Couldn't save tags."
@@ -3025,7 +3025,7 @@ msgstr ""
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "نمی‌توان جریان عمومی را دریاÙت کرد."
#: actions/public.php:130
#, php-format
@@ -3038,15 +3038,15 @@ msgstr "خط زمانی عمومی"
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "خوراک جریان عمومی (RSS 1.0)"
#: actions/public.php:164
msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "خوراک جریان عمومی (RSS 2.0)"
#: actions/public.php:168
msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "خوراک جریان عمومی (Atom)"
#: actions/public.php:188
#, php-format
@@ -3054,6 +3054,7 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"این خط‌زمانی عمومی برای %%site.name%% است، اما هیچ‌کس هنوز چیزی Ù†Ùرستاده است."
#: actions/public.php:191
msgid "Be the first to post!"
@@ -3073,6 +3074,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"این %%site.name%%، یک سرویس [میکروبلاگینگ](http://fa.wikipedia.org/wiki/%D9%"
+"85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%8C%D9%86%DA%AF) بر "
+"پایهٔ نرم‌اÙزار آزاد [StatusNet](http://status.net/) است. ]اکنون بپیوندید[(%%"
+"action.register%%) تا آگاهی‌هایی را دربارهٔ خودتان با دوستان، خانواده و "
+"همکاران‌تان به اشتراک بگذارید! ([بیش‌تر بخوانید](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3081,24 +3087,27 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"این %%site.name%%، یک سرویس [میکروبلاگینگ](http://fa.wikipedia.org/wiki/%D9%"
+"85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%8C%D9%86%DA%AF) بر "
+"پایهٔ نرم‌اÙزار آزاد [StatusNet](http://status.net/) است."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr ""
+msgstr "ابر برچسب عمومی"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "این‌ها محبوب‌ترین برچسب‌های اخیر روی %s هستند "
#: actions/publictagcloud.php:69
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "هیچ‌کس هنوز پیامی با یک [برچسب](%%doc.tags%%) Ù†Ùرستاده است."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "اولین Ù†Ùری باشید Ú©Ù‡ چیزی می‌Ùرستد!"
#: actions/publictagcloud.php:75
#, php-format
@@ -3106,10 +3115,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید Ùˆ اولین Ù†Ùری "
+"باشید Ú©Ù‡ چیزی می‌Ùرستد!"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
-msgstr ""
+msgstr "ابر برچسب"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -3144,24 +3155,25 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
-"اگر شما کلمه ÛŒ عبورتان را Ùراموش کرده اید یا Ú¯Ù… کرده اید، Ù…ÛŒ توانید یک کلمه "
-"ی عبور جدید از آدرس ایمیل ذخیره شده در حسابتان بگیرید."
+"اگر شما گذرواژهٔ خودتان را Ú¯Ù… یا Ùراموش کرده‌اید، شما می‌توانید یکی جدیدتر را "
+"Ú©Ù‡ به نشانی پست الکترونیکی‌تان Ú©Ù‡ در حساب‌تان ذخیره کرده‌اید Ùرستاده شده است، "
+"بگیرید."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "هویت شما شناسایی شد. یک گذرواژه تازه را در زیر وارد کنید. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr "بازیابی کلمه ی عبور"
+msgstr "بازیابی گذرواژه"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr "نام کاربری یا آدرس ایمیل"
+msgstr "نام کاربری یا نشانی پست الکترونیکی"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr "نام کاربری شما بر روی این سرور، یا آدرس ایمیل ثبت شده ی شما."
+msgstr "نام کاربری شما بر روی این سرور، یا نشانی پست الکترونیکی ثبت شدهٔ شما."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -3169,146 +3181,170 @@ msgstr "بازیابی"
#: actions/recoverpassword.php:208
msgid "Reset password"
-msgstr "ریست کردن کلمه ی عبور"
+msgstr "بازنشانی گذرواژه"
#: actions/recoverpassword.php:209
msgid "Recover password"
-msgstr "بازیابی کلمه ی عبور"
+msgstr "بازیابی گذرواژه"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
-msgstr "بازیابی کلمه ی عبور درخواست شد"
+msgstr "بازیابی گذرواژه درخواست شد"
#: actions/recoverpassword.php:213
msgid "Unknown action"
-msgstr ""
+msgstr "عمل نامعلوم"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
-msgstr "Û¶ کاراکتر یا بیشتر، این را Ùراموش نکنید!"
+msgstr "Û¶ نویسه یا بیش‌تر، Ùˆ این را Ùراموش نکنید!"
#: actions/recoverpassword.php:243
msgid "Reset"
-msgstr "ریست( راه انداری مجدد )"
+msgstr "بازنشاندن"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr "یک نام کاربری یا آدرس ایمیل وارد کنید."
+msgstr "یک نام کاربری یا نشانی پست الکترونیکی وارد کنید."
#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
-msgstr "هیچ کاربری با آن آدرس ایمیل یا نام کاربری وجود ندارد."
+msgstr "هیچ کاربری با آن نشانی پست الکترونیکی یا نام کاربری وجود ندارد."
#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr "برای آن کاربر آدرس ایمیل ثبت شده وجود ندارد."
+msgstr "برای آن کاربر نشانی پست الکترونیکی ثبت شده وجود ندارد."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
-msgstr "خطا هنگام ذخیره ی تاییدیه ی آدرس."
+msgstr "هنگام ذخیرهٔ تایید نشانی خطا رخ داد."
#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-"دستورالعمل چگونگی بازیابی کلمه ی عبور به آدرس ایمیل ثبت شده در حساب شما "
-"ارسال شده است."
+"راهنمای چگونگی بازیابی گذرواژه به نشانی پست الکترونیکی ثبت شده در حساب شما "
+"Ùرستاده شده است."
#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
-msgstr "کلمه ی عبور به طور غیر منتظره ریست شد."
+msgstr "گذرواژه به طور غیر منتظره ریست شد."
#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
-msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد."
+msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
-msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند."
+msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
-msgstr ""
+msgstr "هنگام گذاشتن کاربر خطا روی داد."
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
-msgstr "کلمه ÛŒ عبور جدید با موÙقیت ذخیره شد. شما الان وارد شده اید."
+msgstr "گذرواژه تازه با موÙقیت ذخیره شد. شما اکنون وارد شده‌اید."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "با عرض معذرت، تنها اÙراد دعوت شده Ù…ÛŒ توانند ثبت نام کنند."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "با عرض تاسÙØŒ کد دعوت نا معتبر است."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "ثبت نام با موÙقیت انجام شد."
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "اجازه‌ی ثبت نام داده نشده است."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) مواÙقت نکنید."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
-msgstr "آدرس ایمیل از قبل وجود دارد."
+msgstr "نشانی پست الکترونیکی از قبل وجود دارد."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
-msgstr "نام کاربری یا کلمه ی عبور نا معتبر."
+msgstr "نام کاربری یا گذرواژه نا معتبر است."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
+"با این Ùرم شما می‌توانید یک حساب تازه بسازید. سپس شما می‌توانید پیام بÙرستید Ùˆ "
+"به دوستان و همکارانتان بپیوندید. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "Û±-Û¶Û´ حر٠کوچک یا اعداد، بدون نشانه گذاری یا Ùاصله نیاز است."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
-msgstr "۶ کاراکتر یا بیشتر نیاز است."
+msgstr "۶ نویسه یا بیش‌تر مورد نیاز است."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
-msgstr ""
+msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "پست الکترونیکی"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr "من متوجه هستم که محتوا و داده‌های %1$s خصوصی و محرمانه هستند."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "متن و پرونده‌های من دارای حق تکثیر %1$s هستند."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "متن و پرونده‌های من زیر حق تکثیر خودم می‌مانند."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "تمام حقوق محÙوظ است."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره "
-"تلÙÙ†."
+"نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
+"نشانی پیام‌رسان Ùوری Ùˆ شماره تلÙÙ† زیر مجوز %s هستند."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3326,14 +3362,29 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
+"به شما تبریک می‌گوییم، %1$s! و به %%%%site.name%%%% خوش آمدید. از این‌جا، شما "
+"ممکن است بخواهید...\n"
+"\n"
+"* به [نمایه‌تان](%2$s) بروید Ùˆ اولین پیام‌تان را بÙرستید.\n"
+"* یک [Jabber/GTalk نشانی](%%%%action.imsettings%%%%) اضاÙÙ‡ کنید. در این‌صورت "
+"می‌توانیدپیام‌ها را از راه پیام‌های Ùوری بÙرستید.\n"
+"* [به دنبال اÙراد دیگر بگردید](%%%%action.peoplesearch%%%%) Ú©Ù‡ ممکن است آن‌ها "
+"را بشناسید و یا علاقه‌مندی‌هایتان را به اشتراک بگذارید. \n"
+"* [تنظیمات نمایه‌تان](%%%%action.profilesettings%%%%) را به هنگام‌سازی کنید تا "
+"به دیگران بیش‌تر در مورد خودتان بگویید. \n"
+"* برای ویژگی‌هایی که گم کرده‌اید، [اسناد آنلاین](%%%%doc.help%%%%) را "
+"بخوانید. \n"
+"\n"
+"از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم Ùˆ امیدواریم Ú©Ù‡ از استÙاده از این "
+"سرویس لذت ببرید."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
-"(شما باید آنی یک ایمیل دریاÙت کنید، با دستورالعمل چگونگی تایید آدرس ایمیلتان."
-"("
+"(شما هر لحظه باید یک پیام با پست الکترونیکی با راهنمای چگونگی تایید نشانی "
+"پست الکترونیک‌تان دریاÙت کنید.)"
#: actions/remotesubscribe.php:98
#, php-format
@@ -3342,14 +3393,17 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
+"برای اشتراک، شما می‌توانید ]وارد[(%%action.login%%) شوید، یا یک حساب جدید ]"
+"ثبت کنید[(%%action.register%%). اگر شما یک حساب در یک ]وب‌گاه میکروبلاگینگ "
+"سازگار[(%%doc.openmublog%%) دارید، نشانی نمایهٔ خود را در زیر وارد کنید."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "اشتراک از راه دور"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "اشتراک یک کاربر از راه دور"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -3361,56 +3415,58 @@ msgstr "نام کاربری، کاربری که می خواهید او را دن
#: actions/remotesubscribe.php:133
msgid "Profile URL"
-msgstr ""
+msgstr "نشانی نمایه"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
+msgstr "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
msgid "Subscribe"
-msgstr ""
+msgstr "اشتراک"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "نشانی اینترنتی نمایه نامعتبر است (Ùرمت نامناسب است)"
#: actions/remotesubscribe.php:168
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
+"این یک نشانی نمایهٔ صحیح نیست (هیچ سند YADIS وجود ندارد و یا XRDS مشخص شده "
+"نامعتبر است)."
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "این یک نمایهٔ محلی است! برای اشتراک وارد شوید."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
-msgstr ""
+msgstr "نمی‌توان یک نشانهٔ درخواست را به‌دست آورد."
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr "تنها کاربران وارد شده می توانند آگهی ها را تکرار کنند."
+msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
-msgstr "خبری مشخص نشده."
+msgstr "هیچ پیامی مشخص نشده است."
#: actions/repeat.php:76
msgid "You can't repeat your own notice."
-msgstr "شما نمی توانید آگهی خودتان را تکرار کنید."
+msgstr "شما نمی‌توانید پیام خودتان را تکرار کنید."
#: actions/repeat.php:90
msgid "You already repeated that notice."
-msgstr "شما قبلا آن آگهی را تکرار کردید."
+msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
-msgstr ""
+msgstr "تکرار شده"
#: actions/repeat.php:119
msgid "Repeated!"
-msgstr ""
+msgstr "تکرار شد!"
#: actions/replies.php:126 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -3419,9 +3475,9 @@ msgid "Replies to %s"
msgstr "پاسخ‌های به %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "پاسخ‌های به %s"
+msgstr "پاسخ‌های به %1$sØŒ صÙحهٔ %2$d"
#: actions/replies.php:145
#, php-format
@@ -3439,11 +3495,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "خوراک پاسخ‌ها برای %s (Atom)"
#: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
-msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند."
+msgstr ""
+"این خط‌زمانی است که پاسخ‌ها به %1$s را نشان می‌دهد، اما %2$s هنوز یک پیام به "
+"توجه‌اش دریاÙت نکرده است."
#: actions/replies.php:204
#, php-format
@@ -3451,32 +3509,32 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"شما می‌توانید کاربران دیگر را در یک Ú¯Ùت‌وگو سرگرم کنید، مشترک اÙراد بیش‌تری "
+"شوید یا [به گروه‌ها بپیوندید](%%action.groups%%)."
#: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
-"s) پیام می‌Ùرستد."
+"شما می‌توانید [یادآوری %1$s](../%2$s) را امتحان کنید یا [به توجه او چیزی "
+"بÙرستید](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "پاسخ‌های به %1$s در %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "شما نمی توانید کاربری را در این سایت ساکت کنید."
+msgstr "شما نمی‌توانید نقش‌های کاربری را در این وب‌گاه لغو کنید."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "کاربر بدون مشخصات"
+msgstr "کاربر این نقش را ندارد."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "وضعیت حذ٠شد."
@@ -3491,18 +3549,17 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
-msgstr ""
+msgstr "نشست‌ها"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "تنظیمات ظاهری برای این سایت."
+msgstr "تنظیمات نشست برای این وب‌گاه StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
-msgstr ""
+msgstr "مدیریت نشست‌ها"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
@@ -3510,50 +3567,46 @@ msgstr ""
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "اشکال‌زدایی نشست"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "خروجی اشکال‌زدایی برای نشست‌ها روشن شود."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
msgid "Save site settings"
-msgstr ""
+msgstr "ذخیرهٔ تنظیمات وب‌گاه"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
+msgstr "برای دیدن یک برنامه باید وارد شده باشید."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "ابن خبر ذخیره ای ندارد ."
+msgstr "نمایهٔ برنامه"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "شمایل"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
-#, fuzzy
msgid "Name"
-msgstr "نام کاربری"
+msgstr "نام"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
msgid "Organization"
-msgstr "صÙحه بندى"
+msgstr "سازمان"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
-msgstr ""
+msgstr "توصیÙ"
#: actions/showapplication.php:192 actions/showgroup.php:444
#: lib/profileaction.php:187
@@ -3563,11 +3616,11 @@ msgstr "آمار"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "ساخته شده توسط %1$s - دسترسی %2$s به صورت پیش‌Ùرض - %3$d کاربر"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "اعمال برنامه"
#: actions/showapplication.php:236
msgid "Reset key & secret"
@@ -3575,69 +3628,72 @@ msgstr ""
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "اطلاعات برنامه"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "کلید مصرÙ‌کننده"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "رمز مصرÙ‌کننده"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "نشانی اینترنتی شناسهٔ درخواست"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "نشانی اینترنتی نشانهٔ درخواست"
#: actions/showapplication.php:283
-#, fuzzy
msgid "Authorize URL"
-msgstr "مؤلÙ"
+msgstr "نشانی اجازه‌دادن"
#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"توجه: ما امضاهای HMAC-SHA1 را پشتیبانی می‌کنیم. ما روش امضای plaintext را "
+"پشتیبانی نمی‌کنیم."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "آیا اطمینان دارید که می‌خواهید این پیام را پاک کنید؟"
+msgstr "آیا مطمئن هستید که می‌خواهید کلید و رمز خریدار را دوباره تعیین کنید؟"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "دوست داشتنی های %s"
+msgstr "پیام‌های برگزیدهٔ %1$sØŒ صÙحهٔ %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr "ناتوان در بازیابی آگهی های محبوب."
+msgstr "نمی‌توان پیام‌های برگزیده را دریاÙت کرد."
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "خوراک برای برگزیده‌های %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "خوراک برای برگزیده‌های %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr ""
+msgstr "خوراک برای برگزیده‌های %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"شما هنوز هیچ پیام برگزیده‌ای را انتخاب نکرده‌اید. روی دکمهٔ برگزیده کردن پیامی "
+"Ú©Ù‡ دوست دارید کلیک کنید تا آن‌ها را برای بعد چوب‌الÙها کنید یا یک نشانه روی "
+"آن‌ها بگذارید."
#: actions/showfavorites.php:208
#, php-format
@@ -3645,6 +3701,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s تاکنون هیچ پیامی را به برگزیده‌هایش اضاÙÙ‡ نکرده است. چیز جالبی بÙرستید Ú©Ù‡ "
+"ممکن است به برگزیده‌هایشان اضاÙÙ‡ کنند :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3653,6 +3711,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s تاکنون هیچ پیامی را به برگزیده‌هایش اضاÙÙ‡ نکرده است. چرا به [ثبت کردن یک "
+"حساب](%%%%action.register%%%%) اقدام نمی‌کنید و سپس چیز جالبی را که ممکن است "
+"به برگزیده‌هایشان اضاÙÙ‡ کنند، بÙرستید :)"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
@@ -3661,26 +3722,26 @@ msgstr "این یک راه است برای به اشتراک گذاشتن آنچ
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "گروه %s"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "اعضای گروه %sØŒ صÙحهٔ %d"
+msgstr "گروه %1$sØŒ صÙحهٔ %2$d"
#: actions/showgroup.php:227
msgid "Group profile"
-msgstr ""
+msgstr "نمایهٔ گروه"
#: actions/showgroup.php:272 actions/tagother.php:118
#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
-msgstr ""
+msgstr "نشانی اینترنتی"
#: actions/showgroup.php:283 actions/tagother.php:128
#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
-msgstr ""
+msgstr "یادداشت"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
@@ -3688,27 +3749,27 @@ msgstr "نام های مستعار"
#: actions/showgroup.php:302
msgid "Group actions"
-msgstr ""
+msgstr "اعمال گروه"
#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "خوراک پیام برای گروه %s (RSS 1.0)"
#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "خوراک پیام برای گروه %s (RSS 2.0)"
#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "خوراک پیام برای گروه %s (Atom)"
#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
-msgstr ""
+msgstr "FOAF برای گروه %s"
#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
@@ -3722,7 +3783,7 @@ msgstr "هیچ"
#: actions/showgroup.php:404
msgid "All members"
-msgstr "همه ی اعضا"
+msgstr "همهٔ اعضا"
#: actions/showgroup.php:447
msgid "Created"
@@ -3737,6 +3798,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** یک گروه کاربری در %%%%site.name%%%%، یک سرویس [میکروبلاگینگ](http://"
+"fa.wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%"
+"DB%8C%D9%86%DA%AF) بر پایهٔ نرم‌اÙزار آزاد [StatusNet](http://status.net/)ØŒ "
+"است. کاربران آن پیام‌های کوتاهی را دربارهٔ زندگی و علاقه‌مندی‌هایشان به اشتراک "
+"می‌گذارند. [اکنون بپیوندید ](%%%%action.register%%%%) تا یکی از اعضای این "
+"گروه و بلکه بیش‌تر بشوید! ([بیش‌تر بخوانید](%%%%doc.help%%%%))"
#: actions/showgroup.php:469
#, php-format
@@ -3746,10 +3813,15 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
+"**%s** یک گروه کاربری در %%%%site.name%%%%، یک سرویس [میکروبلاگینگ](http://"
+"fa.wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%"
+"DB%8C%D9%86%DA%AF) بر پایهٔ نرم‌اÙزار آزاد [StatusNet](http://status.net/)ØŒ "
+"است. کاربران آن پیام‌های کوتاهی را دربارهٔ زندگی و علاقه‌مندی‌هایشان به اشتراک "
+"می‌گذارند. "
#: actions/showgroup.php:497
msgid "Admins"
-msgstr ""
+msgstr "مدیران"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3757,78 +3829,78 @@ msgstr "چنین پیغامی وجود ندارد."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "تنها Ùرستنده Ùˆ گیرنده می‌توانند این پیام را بخوانند."
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "پیام به %1$s در %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "پیام از %1$s در %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr ""
+msgstr "پیام پاک شد."
#: actions/showstream.php:73
#, php-format
msgid " tagged %s"
-msgstr ""
+msgstr " برچسب‌گذاری‌شده %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%s کاربران مسدود شده، صÙحه‌ی %d"
+msgstr "%1$sØŒ صÙحهٔ %2$d"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "خوراک پاسخ‌ها برای %s (RSS 1.0)"
+msgstr "خوراک پیام‌های %1$s دارای برچسب %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "خوراک پیام‌های %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "خوراک پیام‌های %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "خوراک پیام‌های %s (Atom)"
#: actions/showstream.php:148
#, php-format
msgid "FOAF for %s"
-msgstr ""
+msgstr "FOAF برای %s"
#: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند."
+msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی Ù†Ùرستاده است."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-"اخیرا چیز جالب توجه ای دیده اید؟ شما تا کنون آگهی ارسال نکرده اید، الان می "
-"تواند زمان خوبی برای شروع باشد :)"
+"اخیرا چیز جالب توجهی دیده‌اید؟ شما تاکنون پیامی Ù†Ùرستاده‌اید، الان می‌تواند "
+"زمان خوبی برای شروع باشد :)"
#: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
-"s) پیام می‌Ùرستد."
+"شما می‌توانید یادآوری %1$s را امتحان کنید یا [به توجه او چیزی بÙرستید](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3838,6 +3910,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** یک حساب در %%%%site.name%%%%، یک سرویس ]میکروبلاگینگ[(http://fa."
+"wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%"
+"8C%D9%86%DA%AF) بر پایهٔ نرم‌اÙزار آزاد [StatusNet](http://status.net/) "
+"،دارد. ]اکنون بپیوندید[(%%%%action.register%%%%) تا پیام‌های **%s** و بلکه "
+"بیش‌تر را دنبال کنید! (]بیش‌تر بخوانید[(%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3846,11 +3923,14 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"**%s** یک حساب در %%%%site.name%%%%، یک سرویس ]میکروبلاگینگ[(http://fa."
+"wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%"
+"8C%D9%86%DA%AF) بر پایهٔ نرم‌اÙزار آزاد [StatusNet](http://status.net/) ،دارد. "
#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
-msgstr ""
+msgstr "تکرار %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3861,18 +3941,16 @@ msgid "User is already silenced."
msgstr "کاربر قبلا ساکت شده است."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "تنظیمات پایه ای برای این سایت StatusNet."
+msgstr "تنظیمات پایه برای این وب‌گاه StatusNet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr "نام سایت باید طولی غیر صÙر داشته باشد."
+msgstr "نام وب‌گاه باید طولی غیر صÙر داشته باشد."
#: actions/siteadminpanel.php:141
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "شما باید یک آدرس ایمیل قابل قبول برای ارتباط داشته باشید"
+msgstr "شما باید یک نشانی پست الکترونیکی معتبر برای ارتباط داشته باشید."
#: actions/siteadminpanel.php:159
#, php-format
@@ -3881,7 +3959,7 @@ msgstr ""
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "کمینهٔ محدودیت متن ۰ است (نامحدود)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3889,7 +3967,7 @@ msgstr ""
#: actions/siteadminpanel.php:221
msgid "General"
-msgstr ""
+msgstr "عمومی"
#: actions/siteadminpanel.php:224
msgid "Site name"
@@ -3901,23 +3979,23 @@ msgstr "نام وب‌گاه شما، مانند «میکروبلاگ شرکت Ø
#: actions/siteadminpanel.php:229
msgid "Brought by"
-msgstr "أورده شده به وسیله ی"
+msgstr "آورده‌شده به وسیلهٔ"
#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "متن استÙاده‌شده برای پیوند سازندگان در انتهای هر صÙحه"
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "آورده‌شده با نشانی اینترنتی"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "نشانی اینترنتی استÙاده‌شده برای پیوند سازندگان در انتهای هر صÙحه"
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "نشانی پست الکترونیکی تماس برای وب‌گاه شما"
#: actions/siteadminpanel.php:245
msgid "Local"
@@ -3925,20 +4003,19 @@ msgstr "محلی"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
-msgstr "منطقه ÛŒ زمانی پیش Ùرض"
+msgstr "منطقهٔ زمانی پیش‌Ùرض"
#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
-msgstr "منظقه ÛŒ زمانی پیش Ùرض برای سایت؛ معمولا UTC."
+msgstr "منظقهٔ زمانی پیش‌Ùرض برای وب‌گاه؛ معمولا UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "زبان پیش Ùرض سایت"
+msgstr "زبان پیش‌Ùرض"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
-msgstr ""
+msgstr "شناسایی خودکار زبان وب‌گاه از راه تنظیمات مرورگر در دسترس نیست."
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3950,7 +4027,7 @@ msgstr "محدودیت متن"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr "بیشینهٔ تعداد حرو٠برای آگهی‌ها"
+msgstr "بیشینهٔ تعداد نویسه‌ها برای پیام‌ها."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
@@ -3959,47 +4036,40 @@ msgstr ""
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-"چه مدت کاربران باید منتظر بمانند ( به ثانیه ) تا همان چیز را مجددا ارسال "
-"کنند."
+"Ú†Ù‡ مدت کاربران باید منتظر بمانند (به ثانیه) تا همان چیز را دوباره بÙرستند."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "خبر سایت"
+msgstr "پیام وب‌گاه"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "پیام جدید"
+msgstr "ویرایش پیام عمومی وب‌گاه"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
+msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "بیشینهٔ طول برای پیام عمومی وب‌گاه ۲۵۵ نویسه است."
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "خبر سایت"
+msgstr "متن پیام وب‌گاه"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "متن پیام عمومی وب‌گاه (حداکثر Û²ÛµÛµ نویسه؛ می‌توان از HTML استÙاده کرد)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "خبر سایت"
+msgstr "ذخیرهٔ پیام وب‌گاه"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
-#, fuzzy
msgid "SMS settings"
-msgstr "تنظیمات پیام‌رسان Ùوری"
+msgstr "تنظیمات پیامک"
#. TRANS: SMS settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
@@ -4007,22 +4077,22 @@ msgstr "تنظیمات پیام‌رسان Ùوری"
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
+"شما می‌توانید پیامک‌ها را از راه پست الکترونیک از %%site.name%% دریاÙت کنید."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:97
msgid "SMS is not available."
-msgstr ""
+msgstr "پیامک در دسترس نیست."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "نشانی پیام‌رسان Ùوری"
+msgstr "نشانی پیامک"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "شمارهٔ تلÙÙ† با قابلیت Ùرستادن پیامک Ú©Ù‡ در حال حاضر تایید شده است."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
@@ -4037,20 +4107,18 @@ msgstr "کد تاییدیه"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
-msgstr "کدی را Ú©Ù‡ در گوشیتان گرÙتید وارد کنید."
+msgstr "کدی را Ú©Ù‡ در گوشی‌تان دریاÙت کردید، وارد کنید"
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "تایید"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
-#, fuzzy
msgid "SMS phone number"
-msgstr "شماره تماس پیامک"
+msgstr "شمارهٔ تماس پیامک"
#. TRANS: SMS phone number input field instructions in SMS settings form.
#: actions/smssettings.php:156
@@ -4059,9 +4127,8 @@ msgstr "شماره تلÙن، بدون نشانه گذاری یا Ùاصله، Ø
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "ترجیحات"
+msgstr "ترجیحات پیامک"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4069,12 +4136,13 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"پیام‌ها را برای من از راه پیامک بÙرست؛ من متوجه هستم Ú©Ù‡ ممکن است متحمل هزینهٔ "
+"زیادی از طر٠اپراتورم بشوم."
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "تنظیمات ذخیره شد."
+msgstr "تنظیمات پیامک ذخیره شد."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4084,7 +4152,7 @@ msgstr "بدون شماره تلÙÙ†."
#. TRANS: Message given saving SMS phone number without having selected a carrier.
#: actions/smssettings.php:344
msgid "No carrier selected."
-msgstr ""
+msgstr "هیچ اپراتوری انتخاب نشده است."
#. TRANS: Message given saving SMS phone number that is already set.
#: actions/smssettings.php:352
@@ -4102,41 +4170,39 @@ msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"یک کد تاییدیه به شماره تلÙÙ†ÛŒ Ú©Ù‡ شما وارد کردید ارسال شد. گوشیتان را بررسی "
-"کنید برای کد Ùˆ دستورالعمل چگونگی استÙاده از آن."
+"یک کد تاییدیه به شماره تلÙÙ†ÛŒ Ú©Ù‡ شما وارد کردید، Ùرستاده شد. گوشی‌تان را برای "
+"کد Ùˆ راهنمای استÙاده از آن بررسی کنید."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
-msgstr "آن کد تاییدیه ی نادرست است."
+msgstr "این کد تاییدیه نادرست است."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "تایید Ùسخ شد."
+msgstr "تایید پیامک لغو شد."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
#: actions/smssettings.php:448
msgid "That is not your phone number."
-msgstr "آن شماره تلÙÙ† شما نیست."
+msgstr "این شمارهٔ تلÙÙ† شما نیست."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "شماره تماس پیامک"
+msgstr "شماره تماس پیامک پاک شد."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
-msgstr "امواج موبایل"
+msgstr "اپراتور موبایل"
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:516
msgid "Select a carrier"
-msgstr ""
+msgstr "یک اپراتور را انتخاب کنید"
#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
#. TRANS: %s is an administrative contact's e-mail address.
@@ -4146,6 +4212,9 @@ msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
+"اپراتور موبایل برای گوشی شما. اگر شما اپراتوری را می‌شناسید که از پیامک از "
+"راه پست الکترونیک پشتیبانی می‌کند، اما این‌جا Ùهرست نشده است، در %s نامه "
+"بÙرستید تا ما باخبر شویم."
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
#: actions/smssettings.php:548
@@ -4154,26 +4223,25 @@ msgstr "کدی وارد نشد"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
-msgstr ""
+msgstr "تصاویر لحظه‌ای"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "تغییر پیکربندی سایت"
+msgstr "مدیریت پیکربندی تصویر لحظه‌ای"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "مقدار اجرای تصویر لحظه‌ای نامعتبر است."
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "تناوب تصویر لحظه‌ای باید یک عدد باشد."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "نشانی اینترنتی گزارش تصویر لحظه‌ای نامعتبر است."
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
@@ -4181,19 +4249,19 @@ msgstr ""
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
-msgstr ""
+msgstr "در یک وظیÙÙ‡Ù” برنامه‌ریزی‌شده"
#: actions/snapshotadminpanel.php:206
msgid "Data snapshots"
-msgstr ""
+msgstr "داده‌های تصاویر لحظه‌ای"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "زمان Ùرستادن داده‌های آماری به کارگزارهای status.net"
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
-msgstr ""
+msgstr "Ùرکانس"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
@@ -4201,72 +4269,71 @@ msgstr ""
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "نشانی اینترنتی گزارش"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "تصاویر لحظه‌ای به این نشانی اینترنتی Ùرستاده می‌شوند"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "تنظیمات چهره"
+msgstr "ذخیرهٔ تنظیمات تصویر لحظه‌ای"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
-msgstr "شما به این پروÙيل متعهد نشدید"
+msgstr "شما مشترک آن نمایه نیستید."
#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
-msgstr ""
+msgstr "نمی‌توان اشتراک را ذخیره کرد."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "چنین پرونده‌ای وجود ندارد."
+msgstr "چنین نمایه‌ای وجود ندارد."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "شما به این پروÙيل متعهد نشدید"
+msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
#: actions/subscribe.php:145
msgid "Subscribed"
-msgstr ""
+msgstr "مشترک‌شده"
#: actions/subscribers.php:50
#, php-format
msgid "%s subscribers"
-msgstr ""
+msgstr "%s مشترک"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s کاربران مسدود شده، صÙحه‌ی %d"
+msgstr "مشترک‌های %1$sØŒ صÙحهٔ %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr "این ها کسانی هستند که به آگهی های شما گوش می دهند."
+msgstr "این‌ها کسانی هستند که پیام‌های شما را دنبال می‌کنند."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "این‌ها کسانی هستند که پیام‌های %s را دنبال می‌کنند."
#: actions/subscribers.php:108
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"شما هیچ مشترکی ندارید. تلاش کنید Ú©Ù‡ مشترک اÙرادی شوید Ú©Ù‡ می‌شناسید Ùˆ شاید "
+"آن‌ها هم مشترک شما شوند."
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s هیچ مشترکی ندارد. می‌خواهید اولین مشترک باشید؟"
#: actions/subscribers.php:114
#, php-format
@@ -4274,25 +4341,27 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s هیچ مشترکی ندارد. چرا ]یک حساب ثبت نمی‌کنید[(%%%%action.register%%%%) و "
+"اولین مشترک نمی‌شوید؟"
#: actions/subscriptions.php:52
#, php-format
msgid "%s subscriptions"
-msgstr ""
+msgstr "%s اشتراک"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%d گروه , صÙحه %S"
+msgstr "اشتراک‌های %1$sØŒ صÙحهٔ %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "این‌ها کسانی هستند که پیام‌هایشان را دنبال می‌کنید."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "این‌ها کسانی هستند که %s پیام‌هایشان را دنبال می‌کند."
#: actions/subscriptions.php:126
#, php-format
@@ -4303,11 +4372,17 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"شما در حال حاضر پیام‌های هیچ‌کس را دنبال نمی‌کنید، تلاش کنید Ú©Ù‡ مشترک اÙرادی Ú©Ù‡ "
+"می‌شناسید شوید. [جست‌وجوی اÙراد](%%action.peoplesearch%%) را امتحان کنید، "
+"اعضای گروه‌هایی را که به آن‌ها علاقه دارید و یا [کاربران برجسته](%%action."
+"featured%%) را جست‌وجو کنید. اگر شما یک [کاربر توییتر](%%action."
+"twittersettings%%) هستید، شما می‌توانید به‌صورت خودکار مشترک اÙرادی شوید Ú©Ù‡ "
+"اکنون آن‌جا آن‌ها را دنبال می‌کنید."
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr ""
+msgstr "%s هیچ‌کس را دنبال نمی‌کند."
#: actions/subscriptions.php:208
msgid "Jabber"
@@ -4315,27 +4390,27 @@ msgstr ""
#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "پیامک"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "کاربران خود برچسب‌گذاری شده با %s - صÙحهٔ %d"
+msgstr "پیام‌های برچسب‌دار شده با %1$sØŒ صÙحهٔ %2$d"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "خوراک پیام برای برچسب %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "خوراک پیام برای برچسب %s (RSS 2.0)"
#: actions/tag.php:99
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "خوراک پیام برای برچسب %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
@@ -4344,43 +4419,46 @@ msgstr ""
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "برچسب %s"
#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
-msgstr "پروÙایل کاربر"
+msgstr "نمایهٔ کاربر"
#: actions/tagother.php:81 actions/userauthorization.php:132
#: lib/userprofile.php:103
msgid "Photo"
-msgstr ""
+msgstr "تصویر"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "برچسب‌گذاری کاربر"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"برچسب‌ها برای این کاربر (حروÙØŒ اعداد، -ØŒ .ØŒ Ùˆ _)ØŒ جدا شده با کاما- یا Ùاصله-"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+"شما تنها می‌توانید اÙرادی را برچسب‌دار کنید Ú©Ù‡ مشترک آن‌ها هستید یا آن‌ها مشترک "
+"شما هستند."
#: actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "نمی‌توان برچسب‌ها را ذخیره کرد."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+msgstr "از این روش برای اÙزودن برچسب به مشترک‌ها یا اشتراک‌هایتان استÙاده کنید."
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr ""
+msgstr "چنین برچسبی وجود ندارد."
#: actions/twitapitrends.php:85
msgid "API method under construction."
@@ -4399,13 +4477,12 @@ msgid "User is not silenced."
msgstr "کاربر ساکت نشده است."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
+msgstr "هیچ شناسهٔ نمایه‌ای درخواست نشده است."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "لغو اشتراک شده"
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
@@ -4415,45 +4492,44 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "کاربر"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "تنظیمات کاربری برای این وب‌گاه StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "محدودیت شرح‌حال نادرست است. مقدار محدودیت باید عددی باشد."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "اشتراک پیش‌Ùرض نامعتبر است: «%1$s» کاربر نیست."
#. TRANS: Link description in user account settings menu.
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
-msgstr ""
+msgstr "نمایه"
#: actions/useradminpanel.php:222
msgid "Bio Limit"
-msgstr ""
+msgstr "محدودیت شرح‌حال"
#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
-msgstr "حداکثر طول یک زندگی نامه(در پروÙایل) بر حسب کاراکتر."
+msgstr "بیشینهٔ طول یک شرح‌حال نمایه بر اساس نویسه‌ها."
#: actions/useradminpanel.php:231
msgid "New users"
-msgstr ""
+msgstr "کاربران تازه"
#: actions/useradminpanel.php:235
msgid "New user welcome"
@@ -4461,19 +4537,19 @@ msgstr "خوشامدگویی کاربر جدید"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr "پیام خوشامدگویی برای کاربران جدید( حداکثر 255 کاراکتر)"
+msgstr "متن خوشامدگویی برای کاربران جدید (حداکثر ۲۵۵ نویسه)."
#: actions/useradminpanel.php:241
msgid "Default subscription"
-msgstr ""
+msgstr "اشتراک پیش‌Ùرض"
#: actions/useradminpanel.php:242
msgid "Automatically subscribe new users to this user."
-msgstr ""
+msgstr "به صورت خودکار کاربران تازه‌وارد را مشترک این کاربر کن."
#: actions/useradminpanel.php:251
msgid "Invitations"
-msgstr "دعوت نامه ها"
+msgstr "دعوت‌نامه‌ها"
#: actions/useradminpanel.php:256
msgid "Invitations enabled"
@@ -4481,11 +4557,11 @@ msgstr "دعوت نامه ها Ùعال شدند"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr "خواه به کاربران اجازه ی دعوت کردن کاربران جدید داده شود."
+msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن کاربران تازه داده شود."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "تصدیق اشتراک"
#: actions/userauthorization.php:110
msgid ""
@@ -4493,10 +4569,13 @@ msgid ""
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Rejectâ€."
msgstr ""
+"لطÙا این جزئیات را برای اطمینان از این‌که می‌خواهید مشترک پیام‌های این کاربر "
+"شوید، بررسی کنید. اگر شما درخواست اشتراک پیام‌های کسی را نداده‌اید، روی «رد "
+"کردن» کلیک کنید."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
-msgstr "لیسانس"
+msgstr "مجوز"
#: actions/userauthorization.php:217
msgid "Accept"
@@ -4505,7 +4584,7 @@ msgstr "پذیرÙتن"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "تصویب این کاریر"
+msgstr "مشترک شدن این کاربر"
#: actions/userauthorization.php:219
msgid "Reject"
@@ -4513,15 +4592,15 @@ msgstr "رد کردن"
#: actions/userauthorization.php:220
msgid "Reject this subscription"
-msgstr ""
+msgstr "رد کردن این اشتراک"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "هیچ درخواست اجازه‌ای وجود ندارد!"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
-msgstr ""
+msgstr "اشتراک تصدیق شد"
#: actions/userauthorization.php:256
msgid ""
@@ -4532,7 +4611,7 @@ msgstr ""
#: actions/userauthorization.php:266
msgid "Subscription rejected"
-msgstr ""
+msgstr "اشتراک پذیرÙته نشد"
#: actions/userauthorization.php:268
msgid ""
@@ -4559,32 +4638,34 @@ msgstr ""
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "نشانی تصویر چهره «%s» معتبر نیست."
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "نمی‌توان نشانی اینترنتی چهره را خواند«%s»."
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr "طراحی پروÙیل"
+msgstr "طراحی نمایه"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"شیوهٔ نمایش نمایهٔ خود را با یک تصویر پیش‌زمینه و یک رنگ از جعبهٔ رنگ‌ها به "
+"انتخاب خودتان سÙارشی‌سازی کنید."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
@@ -4592,9 +4673,9 @@ msgstr "از هات داگ خود لذت ببرید!"
#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
#: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "اعضای گروه %sØŒ صÙحهٔ %d"
+msgstr "گروه‌های %1$sØŒ صÙحهٔ %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
@@ -4603,117 +4684,129 @@ msgstr "جستجو برای گروه های بیشتر"
#: actions/usergroups.php:159
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "%s عضو هیچ گروهی نیست."
#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
+"[جست‌وجوی گروه‌ها](%%action.groupsearch%%) را امتحان کنید و به آن‌ها بپیوندید."
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom group notice feed.
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "به روز رسانی‌های %1$s در %2$s"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "آمار"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
+"این وب‌گاه برگرÙته از قدرت %1$s نسخهٔ %2$s دارای حق تکثیر ۲۰۰۸−۲۰۰۹ StatusNet "
+"Inc. و مشارکت‌کنندگان است."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
-msgstr ""
+msgstr "مشارکت‌کنندگان"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet یک نرم‌اÙزار آزاد است: شما می‌توانید آن را بازتوزیع کنید Ùˆ/یا آن را "
+"تحت شرایط مجوز GNU Affero General Public License نسخهٔ ۳، یا (به انتخاب شما) "
+"هر نسخهٔ بعدی دیگری، Ú©Ù‡ توسط بنیاد نرم‌اÙزارهای آزاد منتشر شده است، ویرایش کنید"
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"این برنامه به امید این‌که سودمند خواهد بود، توزیع شده است، اما بدون ضمانت؛ "
+"حتی بدون ضمانت جزئی دارای Ú©ÛŒÙیت Ùروش یا مناسب بودن برای هدÙÛŒ خاص. برای "
+"جزئیات بیش‌تر مجوز «GNU Affero General Public License» را ببینید. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"شما باید یک رونوشت از مجوز GNU Affero General Public License را همراه این "
+"برنامه دریاÙت کرده باشید. اگر چنین نیست، %s را ببینید."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
-msgstr ""
+msgstr "اÙزونه‌ها"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
-#, fuzzy
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
-msgstr "شخصی"
+msgstr "نسخه"
-#: actions/version.php:197
-#, fuzzy
+#: actions/version.php:199
msgid "Author(s)"
-msgstr "مؤلÙ"
+msgstr "مؤلÙ(ها)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"هیچ پرونده‌ای نباید بزرگ‌تر از %d بایت باشد Ùˆ پرونده‌ای Ú©Ù‡ شما Ùرستادید %d بایت "
+"بود. بارگذاری یک نسخهٔ کوچک‌تر را امتحان کنید."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
+"یک پرونده با این حجم زیاد می‌تواند از سهمیهٔ کاربری شما از %d بایت بگذرد."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+"یک پرونده با این حجم زیاد می‌تواند از سهمیهٔ کاربری ماهانهٔ شما از %d بایت "
+"بگذرد."
#: classes/Group_member.php:41
msgid "Group join failed."
-msgstr ""
+msgstr "پیوستن به گروه شکست خورد."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+msgstr "بخشی از گروه نیست."
#: classes/Group_member.php:60
msgid "Group leave failed."
-msgstr ""
+msgstr "ترک کردن گروه شکست خورد."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+msgstr "نمی‌توان گروه محلی را به‌هنگام‌سازی کرد."
#: classes/Login_token.php:76
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "نمی‌توان نام‌های مستعار را ساخت."
+msgstr "نمی‌توان رمز ورود را برای %s ایجاد کرد"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4728,27 +4821,27 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr ""
+msgstr "هنگام اÙزودن برچسب خطا در پایگاه داده رخ داد: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-"تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال "
-"کنید."
+"تعداد زیادی پیام Ùˆ خیلی سریع Ùرستاده شده‌اند؛ استراحت کنید Ùˆ دقایقی دیگر "
+"دوباره بÙرستید."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4756,37 +4849,36 @@ msgstr ""
"تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا "
"ارسال کنید."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
-msgstr "شما از Ùرستادن پست در این سایت مردود شدید ."
+msgstr "شما از Ùرستادن پیام در این وب‌گاه منع شده‌اید."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
-msgstr "مشکل در ذخیره کردن آگهی."
+msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
-#: classes/Notice.php:965
-#, fuzzy
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
-msgstr "مشکل در ذخیره کردن آگهی."
+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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "شما از اشتراک منع شده‌اید."
#: classes/Subscription.php:78
msgid "Already subscribed!"
-msgstr "قبلا تایید شده !"
+msgstr "قبلا اشتراک انجام شده است!"
#: classes/Subscription.php:82
msgid "User has blocked you."
-msgstr ""
+msgstr "کاربر شما را مسدود کرده است."
#: classes/Subscription.php:167
msgid "Not subscribed!"
@@ -4794,21 +4886,20 @@ msgstr "تایید نشده!"
#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
-msgstr ""
+msgstr "نمی‌توان خود-اشتراکی را حذ٠کرد."
#: classes/Subscription.php:200
-#, fuzzy
msgid "Couldn't delete subscription OMB token."
-msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
+msgstr "نمی‌توان رمز اشتراک OMB را حذ٠کرد."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "نمی‌توان اشتراک را لغو کرد."
#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "خوش امدید به %1$s , @%2$s!"
+msgstr "@%2$s، به %1$s خوش آمدید!"
#: classes/User_group.php:480
msgid "Could not create group."
@@ -4821,27 +4912,26 @@ msgstr "نمیتوان گروه را تشکیل داد"
#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr ""
+msgstr "نمی‌توان عضویت گروه را تعیین کرد."
#: classes/User_group.php:524
-#, fuzzy
msgid "Could not save local group info."
-msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
+msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
-msgstr "تنضبمات پروÙيلتان را تغیر دهید"
+msgstr "تنظیمات نمایه‌تان را تغییر دهید"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:116
msgid "Upload an avatar"
-msgstr "یک آواتار ارسال کنید"
+msgstr "بارگذاری یک چهره"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:123
msgid "Change your password"
-msgstr "کلمه ی عبور خود را تغییر دهید"
+msgstr "تغییر گذرواژهٔ شما"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
@@ -4851,7 +4941,7 @@ msgstr "تغیر تنظیمات ایمل ."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
msgid "Design your profile"
-msgstr "پروÙایل خود را طراحی کنید"
+msgstr "نمایهٔ خود را طراحی کنید"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
@@ -4872,312 +4962,301 @@ msgstr "%s گروه %s را ترک کرد."
#. TRANS: Page title for a page without a title set.
#: lib/action.php:161
msgid "Untitled page"
-msgstr "صÙحه ÛŒ بدون عنوان"
+msgstr "صÙحهٔ بدون عنوان"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
-msgstr ""
+msgstr "مسیریابی اصلی وب‌گاه"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "شخصی"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "آدرس ایمیل، آواتار، کلمه ÛŒ عبور، پروÙایل خود را تغییر دهید"
+msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr "متصل شدن به خدمات"
+msgstr "اتصال به سرویس‌ها"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "وصل‌شدن"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
-#, fuzzy
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr "تغییر پیکربندی سایت"
+msgstr "تغییر پیکربندی وب‌گاه"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
-#, fuzzy
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "مدیر"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
-#, fuzzy, php-format
+#: lib/action.php:465
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
+msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
-#, fuzzy
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "دعوت‌کردن"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
-#, fuzzy
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr "خارج شدن از سایت ."
+msgstr "خارج‌شدن از وب‌گاه"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
-#, fuzzy
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "خروج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
-msgstr "یک حساب کاربری بسازید"
+msgstr "ساختن یک جساب‌کاربری"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
-#, fuzzy
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
-msgstr "ثبت نام"
+msgstr "ثبت‌نام"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
-#, fuzzy
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:481
-#, fuzzy
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "ورود"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
-#, fuzzy
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:487
-#, fuzzy
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Ú©Ù…Ú©"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
-#, fuzzy
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr "جستجو برای شخص با متن"
+msgstr "جست‌وجو برای اÙراد یا متن"
-#: lib/action.php:493
-#, fuzzy
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "جست‌وجو"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
-msgstr "خبر سایت"
+msgstr "پیام وب‌گاه"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "دید محلی"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
-msgstr "خبر صÙحه"
+msgstr "پیام صÙحه"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
-msgstr ""
+msgstr "مسیریابی Ùرعی وب‌گاه"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Ú©Ù…Ú©"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "دربارهٔ"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "سوال‌های رایج"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
-msgstr ""
+msgstr "شرایط سرویس"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "خصوصی"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "منبع"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "تماس"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
-msgstr ""
+msgstr "نشان"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم اÙزار"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
+"**%%site.name%%** یک سرویس میکروبلاگینگ که توسط [%%site.broughtby%%](%%site."
+"broughtbyurl%%) برای شما راه‌اندازی شده است."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
+msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"این وب‌گاه نرم‌اÙزار میکروبلاگینگ [StatusNet](http://status.net/) نسخهٔ %s را "
+"اجرا می‌کند که زیر مجوز [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html) در دسترس است."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
-msgstr "مجوز محتویات سایت"
+msgstr "مجوز محتویات وب‌گاه"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
-msgstr ""
+msgstr "حق تکثیر محتوا Ùˆ داده‌ها با %1$s است. تمام حقوق محÙوظ است."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
-msgstr ""
+msgstr "حق تکثیر محتوا Ùˆ داده‌ها با مشارکت‌کنندگان است. تمام حقوق محÙوظ است."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
msgid "After"
-msgstr "بعد از"
+msgstr "پس از"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "قبل از"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"در حال انتظار برای یک عامل خوراک ریشه‌ای، اما یک سند XML کامل دریاÙت شد."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "هنوز نمی‌توان محتویات ازراه‌دور را به‌کار برد."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "هنوز نمی‌توان محتویات XML جاسازی‌شده را به‌کار برد."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "هنوز نمی‌توان محتوای جاسازی‌شدهٔ Base64 را به‌کار برد."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
msgid "You cannot make changes to this site."
-msgstr "شما نمی توانید در این سایت تغیری ایجاد کنید"
+msgstr "شما نمی توانید در این وب‌گاه تغییر ایجاد کنید"
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "اجازه‌ی ثبت نام داده نشده است."
+msgstr "تغییرات در آن قطعه مجاز نیست."
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() پیاده نشده است."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() پیاده نشده است."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
@@ -5186,150 +5265,144 @@ msgid "Unable to delete design setting."
msgstr "نمی توان تنظیمات طراحی شده را پاک کرد ."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
-msgstr "پیکره بندی اصلی سایت"
+msgstr "پیکربندی اولیه وب‌گاه"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
-#, fuzzy
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
-msgstr "سایت"
+msgstr "وب‌گاه"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
-msgstr ""
+msgstr "پیکربندی طرح"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
-#, fuzzy
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "طرح"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
-#, fuzzy
+#: lib/adminpanelaction.php:366
msgid "User configuration"
-msgstr "پیکره بندی اصلی سایت"
+msgstr "پیکربندی کاربر"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "کاربر"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
-#, fuzzy
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
-msgstr "پیکره بندی اصلی سایت"
+msgstr "پیکربندی دسترسی"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
-msgstr ""
+msgstr "پیکربندی مسیرها"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
-#, fuzzy
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
-msgstr "پیکره بندی اصلی سایت"
+msgstr "پیکربندی نشست‌ها"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
-#, fuzzy
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
-msgstr "خبر سایت"
+msgstr "ویرایش پیام وب‌گاه"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
-#, fuzzy
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
-msgstr "پیکره بندی اصلی سایت"
+msgstr "پیکربندی تصاویر لحظه‌ای"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"منبع API به دسترسی خواندن-نوشتن نیاز دارد، اما شما تنها دسترسی خواندن را "
+"دارید."
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "ویرایش برنامه"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "شمایل این برنامه"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
#, php-format
msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "برنامهٔ خود را در %d نویسه توصی٠کنید"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
msgid "Describe your application"
-msgstr ""
+msgstr "برنامهٔ خود را توصی٠کنید"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "نشانی اینترنتی صÙحهٔ خانگی این برنامه"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
-#, fuzzy
msgid "Source URL"
-msgstr "منبع"
+msgstr "نشانی اینترنتی منبع"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "سازمان مسئول این برنامه"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "نشانی اینترنتی برای صÙحهٔ خانگی سازمان"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "نشانی اینترنتی برای دوباره‌هدایت‌کردن بعد از تصدیق"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "مرورگر"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "میزکار"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "نوع برنامه، مرورگر یا میزکار"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "تنها خواندنی"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "خواندن-نوشتن"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
msgid "Default access for this application: read-only, or read-write"
-msgstr ""
+msgstr "دسترسی پیش‌Ùرض برای این برنامه: تنها خواندنی یا خواندن-نوشتن"
#. TRANS: Submit button title
#: lib/applicationeditform.php:359
@@ -5339,12 +5412,12 @@ msgstr "انصراÙ"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "خواندن-نوشتن"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "تنها خواندنی"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
@@ -5354,10 +5427,9 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "حذÙ"
+msgstr "لغو کردن"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5376,21 +5448,19 @@ msgstr "مهیا کننده"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "پیام‌هایی که این پیوست در آن‌جا ظاهر می‌شود"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "برچسب‌ها برای این پیوست"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
-#, fuzzy
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
-msgstr "تغییر گذرواژه"
+msgstr "تغییر گذرواژه شکست خورد"
-#: lib/authenticationplugin.php:235
-#, fuzzy
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
-msgstr "تغییر گذرواژه"
+msgstr "تغییر گذرواژه مجاز نیست"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
@@ -5406,11 +5476,11 @@ msgstr "Ùرمان شکست خورد"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
-msgstr "خبری با این مشخصه ایجاد نشد"
+msgstr "پیامی با این شناسه وجود ندارد"
#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
-msgstr "کاربر آگهی آخر ندارد"
+msgstr "کاربر پیام آخر ندارد"
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
@@ -5422,24 +5492,24 @@ msgstr "پیدا نشد %s کاریری یا نام مستعار"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "پیدا نشد %s کاریری یا نام مستعار"
+msgstr "نمی‌توان یک کاربر محلی با نام کاربری %s پیدا کرد"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr "متاسÙانه این دستور هنوز اجرا نشده."
+msgstr "متاسÙانه این دستور هنوز پیاده نشده است."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "خیلی جالب نیست که به خودتان یادآوری کنید!"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
#: lib/command.php:234
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Ùرتادن اژیر"
+msgstr "یادآوری به %s Ùرستاده‌شد"
#: lib/command.php:260
#, php-format
@@ -5448,13 +5518,13 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
-"اشتراک : %1$s\n"
-"مشترک : %2$s\n"
-"خبر : %3$s"
+"اشتراک‌ها: %1$s\n"
+"مشترک‌ها: %2$s\n"
+"پیام‌ها: %3$s"
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr ""
+msgstr "پیام به‌عنوان برگزیده مشخص شد."
#: lib/command.php:323
msgid "You are already a member of that group"
@@ -5465,14 +5535,14 @@ msgstr "شما از پیش یک عضو این گروه هستید."
#: lib/command.php:339
#, php-format
msgid "Could not join user %1$s to group %2$s"
-msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود."
+msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد"
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود"
+msgstr "نمی‌توان کاربر %1$s را از گروه %2$s حذ٠کرد"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5482,14 +5552,14 @@ msgstr "نام کامل : %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "موقعیت : %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "صÙحه خانگی : %s"
@@ -5498,7 +5568,7 @@ msgstr "صÙحه خانگی : %s"
#: lib/command.php:430
#, php-format
msgid "About: %s"
-msgstr "درباره ی : %s"
+msgstr "دربارهٔ: %s"
#: lib/command.php:457
#, php-format
@@ -5506,15 +5576,17 @@ msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
+"%s یک نمایهٔ ازراه‌دور است؛ شما تنها می‌توانید پیام‌های مستقیم را به کاربران در "
+"یک کارگزار بÙرستید."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
-"تا Ùرستادید"
+"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
+"Ùرستادید"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5529,69 +5601,68 @@ msgstr "خطا در Ùرستادن پیام مستقیم."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr "نمی توان آگهی خودتان را تکرار کرد"
+msgstr "امکان تکرار پیام خودتان وجود ندارد"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr "آن آگهی قبلا تکرار شده است."
+msgstr "آن پیام قبلا تکرار شده است."
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
#: lib/command.php:529
-#, fuzzy, php-format
+#, php-format
msgid "Notice from %s repeated"
-msgstr "آگهی تکرار شد"
+msgstr "پیام از %s تکرار شد"
#: lib/command.php:531
msgid "Error repeating notice."
-msgstr "خطا هنگام تکرار آگهی."
+msgstr "هنگام تکرار پیام خطایی رخ داد."
#: lib/command.php:562
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
-"تا Ùرستادید"
+"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
+"Ùرستادید"
#: lib/command.php:571
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "به این آگهی جواب دهید"
+msgstr "پاسخ به %s Ùرستاده شد"
#: lib/command.php:573
msgid "Error saving notice."
-msgstr "خطا هنگام ذخیره ی آگهی"
+msgstr "هنگام ذخیرهٔ پیام خطا رخ داد."
#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "نام کاربر را برای مشترک‌شدن مشخص کنید"
#: lib/command.php:628
-#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
-msgstr "شما به این پروÙيل متعهد نشدید"
+msgstr "نمی‌توان با دستور مشترک نمایه‌های OMB شد."
#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "مشترک‌شدن %s انجام‌شد"
#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "نام کاربر را برای لغو اشتراک از او مشخص کنید."
#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "از %s لغو اشتراک شد"
#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
-msgstr "دستور هنوز اجرا نشده"
+msgstr "دستور هنوز پیاده نشده است."
#: lib/command.php:685
msgid "Notification off."
-msgstr ""
+msgstr "آگاه‌سازی خاموش شد."
#: lib/command.php:687
msgid "Can't turn off notification."
@@ -5613,29 +5684,30 @@ msgstr "Ùرمان ورود از کار اÙتاده است"
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"این پیوند تنها یک‌بار قابل استÙاده است Ùˆ تنها برای دو دقیقه Ù…Ùید است: %s"
#: lib/command.php:761
-#, fuzzy, php-format
+#, php-format
msgid "Unsubscribed %s"
-msgstr "مشترک‌ها"
+msgstr "لغو اشتراک شده %s"
#: lib/command.php:778
msgid "You are not subscribed to anyone."
-msgstr "شما توسط هیچ کس تصویب نشده اید ."
+msgstr "شما مشترک هیچ‌کسی نشده‌اید."
#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
+msgstr[0] "شما مشترک این Ùرد شده‌اید:"
#: lib/command.php:800
msgid "No one is subscribed to you."
-msgstr "هیچکس شما را تایید نکرده ."
+msgstr "هیچ‌کس مشترک شما نشده است."
#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "هیچکس شما را تایید نکرده ."
+msgstr[0] "این Ùرد مشترک شما شده است:"
#: lib/command.php:822
msgid "You are not a member of any groups."
@@ -5644,7 +5716,7 @@ msgstr "شما در هیچ گروهی عضو نیستید ."
#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "شما یک عضو این گروه نیستید."
+msgstr[0] "شما یک عضو این گروه هستید:"
#: lib/command.php:838
msgid ""
@@ -5687,6 +5759,44 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"دستورات:\n"
+"on - روشن‌کردن آگاه‌سازی‌ها\n"
+"off - خاموش‌کردن آگاه‌سازی‌ها\n"
+"help - نشان دادن این کمک\n"
+"follow <nickname> - مشترک کاربر شدن\n"
+"groups - گروه‌هایی را Ú©Ù‡ به آن‌ها پیوسته‌اید، Ùهرست می‌کند\n"
+"subscriptions - اÙرادی را Ú©Ù‡ دنبال می‌کنید، Ùهرست می‌کند\n"
+"subscribers - کاربرانی را Ú©Ù‡ شما را دنبال می‌کنند، Ùهرست می‌کند\n"
+"leave <nickname> - لغو اشتراک از کاربر\n"
+"d <nickname> <text> - پیام مستقیم به کاربر\n"
+"get <nickname> - دریاÙت آخرین پیام از کاربر\n"
+"whois <nickname> - دریاÙت اطلاعات نمایهٔ کاربر\n"
+"lose <nickname> - وادار کردن کاربر به توق٠دنبال‌کردن شما\n"
+"fav <nickname> - اÙزودن آخرین پیام کاربر به عنوان برگزیده\n"
+"fav #<notice_id> - اÙزودن پیام با یک شناسهٔ داده‌شده به عنوان برگزیده\n"
+"repeat #<notice_id> - تکرار کردن یک پیام با یک شناسهٔ داده‌شده\n"
+"repeat <nickname> - تکرار کردن آخرین پیام از کاربر\n"
+"reply #<notice_id> - پاسخ‌دادن به یک پیام با یک شناسهٔ داده‌شده\n"
+"reply <nickname> - پاسخ‌دادن به آخرین پیام از کاربر\n"
+"join <group> - پیوستن به گروه\n"
+"login - دریاÙت یک پیوند برای واردشدن به رابط وب\n"
+"drop <group> - ترک‌کردن گروه\n"
+"stats - دریاÙت آمار شما\n"
+"stop - مانند «off»\n"
+"quit - مانند «off»\n"
+"sub <nickname> - مانند «follow»\n"
+"unsub <nickname> - مانند «leave»\n"
+"last <nickname> - مانند «get»\n"
+"on <nickname> - هنوز پیاده نشده است.\n"
+"off <nickname> - هنوز پیاده نشده است.\n"
+"nudge <nickname> - یادآوری‌کردن به یک کاربر برای به‌روز کردن\n"
+"invite <phone number> - هنوز پیاده نشده است.\n"
+"track <word> - هنوز پیاده نشده است.\n"
+"untrack <word> - هنوز پیاده نشده است.\n"
+"track off - هنوز پیاده نشده است.\n"
+"untrack all - هنوز پیاده نشده است.\n"
+"tracks - هنوز پیاده نشده است.\n"
+"tracking - هنوز پیاده نشده است.\n"
#: lib/common.php:135
msgid "No configuration file found. "
@@ -5694,7 +5804,7 @@ msgstr ""
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "من به دنبال پرونده‌های پیکربندی در مکان‌های زیر بودم: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
@@ -5710,20 +5820,19 @@ msgstr "پیام‌رسان Ùوری"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "به‌هنگام‌سازی‌های انجام‌شده با پیام‌رسان Ùوری (IM)"
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr "به روز رسانی با پیامک"
+msgstr "به‌روزرسانی با پیامک"
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgid "Connections"
-msgstr "وصل‌شدن"
+msgstr "اتصال‌ها"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "برنامه‌های وصل‌شدهٔ مجاز"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -5731,28 +5840,30 @@ msgstr "خطای پایگاه داده"
#: lib/designsettings.php:105
msgid "Upload file"
-msgstr "ارسال Ùایل"
+msgstr "بارگذاری پرونده"
#: lib/designsettings.php:109
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"شما می‌توانید تصویر پیش‌زمینهٔ شخصی خود را بارگذاری کنید. بیشینهٔ اندازهٔ پرونده "
+"۲ مگابایت است."
#: lib/designsettings.php:418
msgid "Design defaults restored."
-msgstr ""
+msgstr "پیش‌Ùرض‌های طراحی برگردانده شدند."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr ""
+msgstr "خارج‌کردن این پیام از برگزیده‌ها"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr "طرÙدار این خبر"
+msgstr "برگزیده‌کردن این پیام"
#: lib/favorform.php:140
msgid "Favor"
-msgstr "توجه کردن"
+msgstr "برگزیده‌کردن"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -5776,7 +5887,7 @@ msgstr "صادر کردن داده"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr ""
+msgstr "پالایهٔ برچسب‌ها"
#: lib/galleryaction.php:131
msgid "All"
@@ -5784,15 +5895,15 @@ msgstr "همه"
#: lib/galleryaction.php:139
msgid "Select tag to filter"
-msgstr ""
+msgstr "برچسب را برای پالودن انتخاب کنید"
#: lib/galleryaction.php:140
msgid "Tag"
-msgstr ""
+msgstr "برچسب"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "یک برچسب را برای محدود کردن Ùهرست انتخاب کنید"
#: lib/galleryaction.php:143
msgid "Go"
@@ -5805,26 +5916,26 @@ msgstr ""
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+msgstr "نشانی اینترنتی صÙحهٔ‌خانگی یا وبلاگ گروه یا موضوع"
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr ""
+msgstr "گروه یا موضوع را توصی٠کنید"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "گروه یا موضوع را در %d نویسه توصی٠کنید"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgstr "نام‌های مستعار اضاÙÛŒ برای گروه، با کاما- یا Ùاصله- جدا شود، بیشینه %d"
#: lib/groupnav.php:85
msgid "Group"
@@ -5837,7 +5948,7 @@ msgstr "مسدود شده"
#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
-msgstr ""
+msgstr "%s کاربر مسدود شده"
#: lib/groupnav.php:108
#, php-format
@@ -5851,12 +5962,12 @@ msgstr "نشان"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "اÙزودن یا ویرایش نشان"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "طرح %s را اضاÙÙ‡ یا ویرایش کنید"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -5869,12 +5980,12 @@ msgstr "گروه های با پست های بیشتر"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "برچسب‌ها در پیام‌های گروه %s"
#. TRANS: Client exception 406
#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "این صÙحه در نوع رسانه‌ای Ú©Ù‡ پذیرÙته‌اید، در دسترس نیست."
#: lib/imagefile.php:72
msgid "Unsupported image file format."
@@ -5883,8 +5994,7 @@ msgstr "Ùرمت(Ùایل) عکس پشتیبانی نشده."
#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
-"است . این Ùایل بسیار یزرگ است %s بیشترین مقدار قابل قبول برای اندازه ÛŒ Ùایل."
+msgstr "این پرونده خیلی بزرگ است. بیشینهٔ اندازهٔ پرونده %s است."
#: lib/imagefile.php:93
msgid "Partial upload."
@@ -5892,7 +6002,7 @@ msgstr ""
#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr "خطای سیستم ارسال Ùایل."
+msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
@@ -5922,7 +6032,7 @@ msgstr ""
#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
-msgstr ""
+msgstr "منبع صندوق ورودی نامعلوم است %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5934,7 +6044,7 @@ msgstr "ترک کردن"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
-msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور"
+msgstr "وارد شدن با یک نام کاربری و گذرواژه"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
@@ -5943,7 +6053,7 @@ msgstr "عضویت برای حساب کاربری جدید"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
msgid "Email address confirmation"
-msgstr "تاییدیه ی آدرس ایمیل"
+msgstr "تایید نشانی پست الکترونیکی"
#. TRANS: Body for address confirmation email.
#: lib/mail.php:177
@@ -5962,15 +6072,35 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"سلام %s. \n"
+"\n"
+"کسی این پست الکترونیکی را در %s وارد کرده است.\n"
+"\n"
+"اگر شما بودید، و می‌خواهید که ورودی خود را تایید کنید، از نشانی اینترنتی زیر "
+"استÙاده کنید:\n"
+"\n"
+"\t%s\n"
+"\n"
+"اگر چنین نیست، این پیام را نادیده بگیرید.\n"
+"\n"
+"از این‌که وقت خود را در اختیار ما گذاشتید، سپاس‌گزاریم، \n"
+"%s\n"
#. TRANS: Subject of new-subscriber notification e-mail
#: lib/mail.php:243
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%2$s از حالا به خبر های شما گوش میده %1$s"
+msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند."
+
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5984,21 +6114,31 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"با تشکر از شما،\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"نشانی پست الکترونیک یا گزینه‌های آگاه‌سازی را در %8$s تغییر دهید\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
-#, fuzzy, php-format
+#: lib/mail.php:274
+#, php-format
msgid "Bio: %s"
-msgstr "موقعیت : %s"
+msgstr "شرح‌حال: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ادرس ایمیل جدید برای"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6010,38 +6150,40 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
-" %1$s شما یک ادرس پست جدید دارید در .\n"
-"ایمیل بزنید %s برای پست یک پیغام جدید به .\n"
-" %3$s راهنمای ایمیل بیشتر در .\n"
+"شما یک نشانی ارسال تازه در %1$s دارید.\n"
+"\n"
+"برای Ùرستادن پیام‌های جدید به %2$s نامه بÙرستید.\n"
+"\n"
+"راهنمایی‌های پست الکترونیکی بیش‌تر در %3$s وجود دارد.\n"
"\n"
-", ازروی ÙˆÙاداری خود شما \n"
+"با تشکر از شما،\n"
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "وضعیت %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
-msgstr "تایید پیامک"
+msgstr "تأیید پیامک"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "منتظر تاییدیه برای این شماره تلÙÙ†."
+msgstr "%s: شماره تلÙÙ† خود را با این کد تایید کنید:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
-msgstr ""
+msgstr "شما توسط %s یادآوری شدید."
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6056,15 +6198,26 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) کنجکاو است Ú©Ù‡ این روزها چکار می‌کنید Ùˆ شما را برای Ùرستادن "
+"خبرهایی دعوت کرده است.\n"
+"\n"
+"پس بیایید که از شما بیش‌تر بشنویم :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"به این نامه پاسخ ندهید؛ زیرا به آن‌ها نخواهد رسید.\n"
+"\n"
+"با احترام،\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
-msgstr ""
+msgstr "پیام خصوصی تازه از %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6082,15 +6235,29 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) یک پیام خصوصی برای شما Ùرستاده است:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"شما می‌توانید این‌جا به پیام‌شان پاسخ دهید:\n"
+"\n"
+"%4$s\n"
+"\n"
+"به این پست الکترونیک پاسخ ندهید، چون پاسخ شما به آن‌ها نمی‌رسد.\n"
+"\n"
+"با احترام،\n"
+"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr " خبر شما را به علایق خود اضاÙÙ‡ کرد %s (@%s)"
+msgstr "پیام شما را به برگزیده‌های خود اضاÙÙ‡ کرد %s (@%s)"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6110,23 +6277,46 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) پیام شما در %2$s را به‌عنوان یکی از برگزیده‌هایشان اÙزوده است.\n"
+"\n"
+"نشانی اینترنتی پیام شما \n"
+"\n"
+"%3$s\n"
+"\n"
+"است.\n"
+"\n"
+"متن پیام شما\n"
+"\n"
+"%4$s\n"
+"\n"
+"است.\n"
+"\n"
+"شما می‌توانید Ùهرست برگزیده‌های %1$s را این‌جا ببینید:\n"
+"\n"
+"%5$s\n"
+"\n"
+"با تشکر از شما،\n"
+"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"Ú¯Ùت‌وگوی کامل می‌تواند این‌جا خوانده شود:\n"
+"\n"
+"\t\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr "به توجه شما یک خبر Ùرستاده شده %s (@%s)"
+msgstr "%s (@%s) به توجه شما یک پیام Ùرستاد"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6152,10 +6342,32 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) یک پاسخ به پیام شما (یک «@-پاسخ») در %2$s داده است.\n"
+"\n"
+"پیام این است:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"پاسخ داده است:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sشما می‌توانید این‌جا پاسخ دهید:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"Ùهرست تمام @-پاسخ‌ها برای شما این‌جا است:\n"
+"\n"
+"%7$s\n"
+"\n"
+"با تشکر،\n"
+"%2$s\n"
+"\n"
+"پ.ن. شما می‌توانید این آگاه‌سازی با نامه را این‌جا خاموش کنید:%8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr "تنها کاربران می تواند صندوق نامه ی خودشان را بخوانند."
+msgstr "تنها کاربران می تواند صندوق نامهٔ خودشان را بخوانند."
#: lib/mailbox.php:139
msgid ""
@@ -6163,7 +6375,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "از"
@@ -6184,9 +6396,9 @@ msgid "Sorry, no incoming email allowed."
msgstr "با عرض پوزش، اجازه‌ی ورودی پست الکترونیک وجود ندارد"
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Ùرمت(Ùایل) عکس پشتیبانی نشده."
+msgstr "نوع پیام پشتیبانی نشده است: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
@@ -6205,7 +6417,7 @@ msgstr ""
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr "Ùایل ارسال شده نتها اندکی ارسال شد."
+msgstr "نتها اندکی از Ùایل بارگذاری‌شده Ùرستاده شد."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
@@ -6217,20 +6429,19 @@ msgstr "شکست خوردن در نوشتن Ùایل روی دیسک."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "بارگذاری پرونده توسط اÙزونه متوق٠شد."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "پرونده از سهمیهٔ کاربر می‌گذرد."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
msgstr "Ùایل نتوانست به دایرکتوری مقصد منتقل شود."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "نمی‌توان کاربر منبع را تعیین کرد."
+msgstr "نمی‌توان Ùرمت پرونده را تعیین کرد."
#: lib/mediafile.php:270
#, php-format
@@ -6240,11 +6451,11 @@ msgstr "تلاش برای امتحان نوع دیگر %s"
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "%s یک گونهٔ پروندهٔ پیشتیبانی شده روی این کارگزار نیست."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr "یک Ø¢Ú¯Ù‡ÛŒ مستقیم بÙرستید."
+msgstr "Ùرستادن یک پیام مستقیم"
#: lib/messageform.php:146
msgid "To"
@@ -6255,43 +6466,42 @@ msgid "Available characters"
msgstr "کاراکترهای موجود"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Ùرستادن"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "یک Ø¢Ú¯Ù‡ÛŒ بÙرستید"
+msgstr "Ùرستادن یک پیام"
#: lib/noticeform.php:173
#, php-format
msgid "What's up, %s?"
-msgstr "چه شده %s ?"
+msgstr "چه خبر، %s؟"
#: lib/noticeform.php:192
msgid "Attach"
-msgstr "ضمیمه کردن"
+msgstr "پیوست کردن"
#: lib/noticeform.php:196
msgid "Attach a file"
-msgstr "یک Ùایل ضمیمه کنید"
+msgstr "یک Ùایل پیوست کنید"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
+msgstr "مکان من به اشتراک گذاشته شود"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
+msgstr "موقعیت من به اشتراک گذاشته نشود"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"متاسÙیم، دریاÙت محل جغراÙیایی شما بیش از انتظار طول کشیده است، لطÙا بعدا "
+"دوباره تلاش کنید."
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
@@ -6322,61 +6532,61 @@ msgstr ""
msgid "at"
msgstr "در"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "در زمینه"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "تکرار از"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
-msgstr "به این آگهی جواب دهید"
+msgstr "به این پیام پاسخ دهید"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
-msgstr "جواب دادن"
+msgstr "پاسخ"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
-msgstr "آگهی تکرار شد"
+msgstr "پیام تکرار شد"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr ""
+msgstr "یادآوری‌کردن به این کاربر"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "یادآوری‌کردن"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr "برای این کاربر اژير بÙرست"
+msgstr "یک یادآوری به این کاربر Ùرستاده شود"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
-msgstr "خطا در درج مشخصات جدید"
+msgstr "هنگام قرار دادن نمایهٔ تازه خطا رخ داد"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "هنگام اÙزودن چهره خطایی رخ داد"
#: lib/oauthstore.php:306
msgid "Error updating remote profile"
-msgstr "اشکال در به روز کردن کاربر دوردست."
+msgstr "هنگام به‌روز کردن نمایهٔ از راه دور خطا رخ داد"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
-msgstr ""
+msgstr "هنگام اÙزودن نمایهٔ ازراه‌دور خطایی رخ داد"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr ""
+msgstr "رونوشت‌برداری از پیام"
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "نمی‌توان اشتراک تازه‌ای اÙزود."
#: lib/personalgroupnav.php:99
msgid "Personal"
@@ -6388,7 +6598,7 @@ msgstr "پاسخ ها"
#: lib/personalgroupnav.php:114
msgid "Favorites"
-msgstr "چیزهای مورد علاقه"
+msgstr "برگزیده‌ها"
#: lib/personalgroupnav.php:125
msgid "Inbox"
@@ -6404,16 +6614,16 @@ msgstr "صندوق خروجی"
#: lib/personalgroupnav.php:131
msgid "Your sent messages"
-msgstr "پیام های Ùرستاده شده به وسیله ÛŒ شما"
+msgstr "پیام‌های Ùرستاده شدهٔ شما"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "برچسب‌ها در پیام‌های %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
-msgstr ""
+msgstr "ناشناخته"
#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -6442,15 +6652,15 @@ msgstr "عضو شده از"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "میانگین روزانه"
#: lib/profileaction.php:264
msgid "All groups"
msgstr "تمام گروه‌ها"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
-msgstr ""
+msgstr "روش پیاده نشده است."
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -6472,14 +6682,13 @@ msgstr "خصوصیت"
msgid "Popular"
msgstr "محبوب"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "به این آگهی جواب دهید"
+msgstr "این پیام تکرار شود؟"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6487,16 +6696,16 @@ msgstr "بله"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr ""
+msgstr "تکرار این پیام"
#: lib/revokeroleform.php:91
#, fuzzy, php-format
msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر را به گروه مسدود کن"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -6524,23 +6733,23 @@ msgstr "راهنمای جستجو"
#: lib/searchgroupnav.php:80
msgid "People"
-msgstr "شخص"
+msgstr "اÙراد"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr "پیدا کردن شخص در این سایت"
+msgstr "پیدا کردن اÙراد در این وب‌گاه"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr ""
+msgstr "پیدا کردن محتوای پیام‌ها"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr "پیداا کردن گروه ها در این سایت"
+msgstr "پیدا کردن گروه‌ها در این وب‌گاه"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "بخش بی‌نام"
#: lib/section.php:106
msgid "More..."
@@ -6548,11 +6757,11 @@ msgstr "بیش‌تر..."
#: lib/silenceform.php:67
msgid "Silence"
-msgstr "آرامش"
+msgstr "ساکت کردن"
#: lib/silenceform.php:78
msgid "Silence this user"
-msgstr "آرامش این کاربر"
+msgstr "ساکت کردن این کاربر"
#: lib/subgroupnav.php:83
#, php-format
@@ -6562,7 +6771,7 @@ msgstr ""
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr ""
+msgstr "اÙراد مشترک %s"
#: lib/subgroupnav.php:99
#, php-format
@@ -6576,7 +6785,7 @@ msgstr "دعوت‌کردن"
#: lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
+msgstr "به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -6592,6 +6801,51 @@ msgstr ""
msgid "None"
msgstr "هیچ"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "به روز رسانی چهره موÙقیت آمیر نبود."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "اعلان های بالا"
@@ -6606,24 +6860,24 @@ msgstr ""
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "از حالت سکوت درآوردن"
#: lib/unsilenceform.php:78
msgid "Unsilence this user"
-msgstr ""
+msgstr "این کاربر از حالت سکوت خارج شود"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "لغو مشترک‌شدن از این کاربر"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr ""
+msgstr "لغو اشتراک"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "کاربر هیچ شناس‌نامه‌ای ندارد."
+msgstr "کاربر %s (%d) هیچ تاریخچهٔ نمایه‌ای ندارد."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6631,15 +6885,15 @@ msgstr "ویرایش اواتور"
#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
-msgstr ""
+msgstr "اعمال کاربر"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "پاک‌کردن کاربر در حالت اجرا است..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
-msgstr "ویرایش تنظیمات پروÙيل"
+msgstr "ویرایش تنظیمات نمایه"
#: lib/userprofile.php:264
msgid "Edit"
@@ -6655,74 +6909,73 @@ msgstr "پیام"
#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "اداره کردن"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "پروÙایل کاربر"
+msgstr "وظیÙÙ‡Ù” کاربر"
#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr ""
+msgstr "رئیس"
#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "مدیر"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "حدود یک سال پیش"
@@ -6734,11 +6987,11 @@ msgstr "%s یک رنگ صحیح نیست!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr "%s یک رنگ صحیح نیست! از Û³ یا Û¶ حر٠مبنای شانزده استÙاده کنید"
+msgstr "%s یک رنگ صحیح نیست! از Û³ یا Û¶ نویسه مبنای شانزده استÙاده کنید"
#: lib/xmppmanager.php:403
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
-"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
-"تا Ùرستادید"
+"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
+"Ùرستادید."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 9020ccaeb..2b5f91e41 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:39+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:30+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Hyväksy"
@@ -70,9 +70,8 @@ msgstr ""
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
-#, fuzzy
msgid "Closed"
-msgstr "Estä"
+msgstr "Suljettu"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
@@ -93,25 +92,25 @@ msgid "Save"
msgstr "Tallenna"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Sivua ei ole."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -124,7 +123,7 @@ msgid "No such user."
msgstr "Käyttäjää ei ole."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s ja kaverit, sivu %d"
@@ -132,33 +131,33 @@ msgstr "%s ja kaverit, sivu %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s ja kaverit"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Käyttäjän %s kavereiden syöte (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -166,7 +165,7 @@ msgstr ""
"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
"vielä mitään."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -176,7 +175,7 @@ msgstr ""
"tai lähetä päivitys itse."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, fuzzy, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -185,7 +184,7 @@ msgstr ""
"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
"newnotice%%%%?status_textarea=%s)!"
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -193,65 +192,65 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Sinä ja kaverit"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metodia ei löytynyt!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Tämä metodi edellyttää POST sanoman."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Ei voitu päivittää käyttäjää."
@@ -273,7 +272,7 @@ msgstr "Ei voitu tallentaa profiilia."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -333,44 +332,44 @@ msgstr "Suorat viestit käyttäjälle %s"
msgid "All the direct messages sent to %s"
msgstr "Kaikki suorat viestit käyttäjälle %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Viestissä ei ole tekstiä!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Vastaanottajaa ei löytynyt."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Tämä päivitys on jo suosikki!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Ei voitu lisätä suosikiksi."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
#, fuzzy
msgid "That status is not a favorite."
msgstr "Tämä päivitys ei ole suosikki!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Ei voitu poistaa suosikkia."
@@ -406,122 +405,122 @@ msgstr "Julkista päivitysvirtaa ei saatu."
msgid "Could not find target user."
msgstr "Ei löytynyt yhtään päivitystä."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
"välilyöntiä."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Tuo ei ole kelvollinen tunnus."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Kotisivun verkko-osoite ei ole toimiva."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Liikaa aliaksia. Maksimimäärä on %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Virheellinen alias: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias ei voi olla sama kuin ryhmätunnus."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Ryhmää ei löytynyt!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Sinä kuulut jo tähän ryhmään."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Sinä et kuulu tähän ryhmään."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Käyttäjän %s ryhmät"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Ryhmät, joiden jäsen %s on"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Käyttäjän %s ryhmät"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, fuzzy, php-format
msgid "groups on %s"
msgstr "Ryhmän toiminnot"
@@ -537,15 +536,15 @@ msgstr "Koko ei kelpaa."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -611,12 +610,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Käyttäjätili"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -624,8 +623,8 @@ msgid "Nickname"
msgstr "Tunnus"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Salasana"
@@ -643,11 +642,11 @@ msgstr "Kaikki"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Et voi poistaa toisen käyttäjän päivitystä."
@@ -666,25 +665,25 @@ msgstr "Ilmoituksia ei voi pistää päälle."
msgid "Already repeated that notice."
msgstr "Poista tämä päivitys"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Päivitys poistettu."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ei löytynyt."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -693,33 +692,33 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
msgid "Unsupported format."
msgstr "Formaattia ei ole tuettu."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Käyttäjän %s suosikit"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Vastaukset päivitykseen %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s julkinen aikajana"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s päivitykset kaikilta!"
@@ -734,12 +733,12 @@ msgstr "Vastaukset käyttäjälle %s"
msgid "Repeats of %s"
msgstr "Vastaukset käyttäjälle %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Päivitykset joilla on tagi %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
@@ -797,7 +796,7 @@ msgid "Preview"
msgstr "Esikatselu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Poista"
@@ -839,11 +838,11 @@ msgstr "Kuva poistettu."
msgid "You already blocked that user."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Estä käyttäjä"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -855,7 +854,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -865,7 +864,7 @@ msgstr "Ei"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
@@ -874,7 +873,7 @@ msgstr "Älä estä tätä käyttäjää"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -883,11 +882,11 @@ msgid "Yes"
msgstr "Kyllä"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
@@ -1019,7 +1018,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1053,7 +1052,7 @@ msgstr "Poista tämä päivitys"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Et ole kirjautunut sisään."
@@ -1084,7 +1083,7 @@ msgid "Do not delete this notice"
msgstr "Älä poista tätä päivitystä"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -1124,51 +1123,60 @@ msgstr "Ulkoasu"
msgid "Design settings for this StatusNet site."
msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Koko ei kelpaa."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Vaihda salasanasi"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "Kutsu"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Vaihda"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
#, fuzzy
msgid "Theme for the site."
msgstr "Kirjaudu ulos palvelusta"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Palvelun ilmoitus"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Vaihda tautakuva"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tausta"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1176,58 +1184,66 @@ msgid ""
msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Sisältö"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Haku"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Teksti"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Linkit"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Käytä oletusasetuksia"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1237,7 +1253,7 @@ msgstr ""
msgid "Save"
msgstr "Tallenna"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1531,7 +1547,7 @@ msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -1767,13 +1783,13 @@ msgstr "Käyttäjä on asettanut eston sinulle."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Profiilia ei ole määritelty."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ei profiilia tuolle ID:lle."
@@ -1910,7 +1926,7 @@ msgstr "Tee tästä käyttäjästä ylläpitäjä"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s aikajana"
@@ -2338,42 +2354,42 @@ msgstr "Sinä et kuulu tähän ryhmään."
msgid "%1$s left group %2$s"
msgstr "%s erosi ryhmästä %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Olet jo kirjautunut sisään."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Väärä käyttäjätunnus tai salasana"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
"useampi käyttäjä!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Oletko hukannut tai unohtanut salasanasi?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2381,11 +2397,15 @@ msgstr ""
"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
"asetuksiesi muuttamista."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä "
"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
@@ -2595,31 +2615,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Päivitykselle ei ole profiilia"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Käyttäjän %1$s päivitys %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "Yhdistä"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -2729,7 +2749,7 @@ msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Vahvista"
@@ -2741,11 +2761,11 @@ msgstr "Sama kuin ylläoleva salasana"
msgid "Change"
msgstr "Vaihda"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Salasanat eivät täsmää."
@@ -2766,7 +2786,7 @@ msgid "Password saved."
msgstr "Salasana tallennettu."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Polut"
@@ -2986,43 +3006,43 @@ msgstr ""
"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
"välilyöntejä"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Koko nimi"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Kotisivu"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Tietoja"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Kotipaikka"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -3066,7 +3086,7 @@ msgstr ""
"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
"ihmiskäyttäjille)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
@@ -3318,7 +3338,7 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
msgid "Password and confirmation do not match."
msgstr "Salasana ja salasanan vahvistus eivät täsmää."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
@@ -3327,75 +3347,97 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Virheellinen kutsukoodin."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Rekisteröityminen ei ole sallittu."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Sähköpostiosoite on jo käytössä."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Käyttäjätunnus tai salasana ei kelpaa."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
"välilyöntejä. Pakollinen."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 tai useampia merkkejä. Pakollinen."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Sähköposti"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
"salasanan uudelleen käyttöönottoon."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Pitempi nimi, mieluiten oikea nimesi"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3404,7 +3446,7 @@ msgstr ""
"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
"puhelinnumero."
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3437,7 +3479,7 @@ msgstr ""
"\n"
"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3526,7 +3568,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
msgid "You already repeated that notice."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Luotu"
@@ -3602,7 +3644,7 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle."
msgid "User doesn't have this role."
msgstr "Käyttäjälle ei löydy profiilia"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Päivitys poistettu."
@@ -3619,7 +3661,7 @@ msgstr "Käyttäjä on asettanut eston sinulle."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3666,7 +3708,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3679,7 +3721,7 @@ msgid "Organization"
msgstr "Sivutus"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Kuvaus"
@@ -4295,7 +4337,7 @@ msgstr "Koodia ei ole syötetty."
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4656,7 +4698,7 @@ msgstr ""
"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
"paina \"Peruuta\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Lisenssi"
@@ -4786,29 +4828,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Tilastot"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4816,7 +4858,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4824,40 +4866,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "Omat"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4901,28 +4943,28 @@ msgid "Could not update message with new URI."
msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4930,22 +4972,22 @@ msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
#. 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:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5053,133 +5095,133 @@ msgid "Untitled page"
msgstr "Nimetön sivu"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Omat"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Yhdistä"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ensisijainen sivunavigointi"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Ylläpito"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Kutsu"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Kirjaudu ulos"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Rekisteröidy"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Kirjaudu sisään"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ohjeet"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5187,72 +5229,72 @@ msgstr "Haku"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Palvelun ilmoitus"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Paikalliset näkymät"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Sivuilmoitus"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Ohjeet"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Tietoa"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "UKK"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Yksityisyys"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Lähdekoodi"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:784
+#: lib/action.php:794
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5262,13 +5304,13 @@ msgstr ""
"site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** on mikroblogipalvelu."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5280,55 +5322,55 @@ msgstr ""
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Aiemmin"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5336,11 +5378,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5376,74 +5418,74 @@ msgid "Unable to delete design setting."
msgstr "Twitter-asetuksia ei voitu tallentaa!"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Sähköpostiosoitteen vahvistus"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Kutsu"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "SMS vahvistus"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Ulkoasu"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "SMS vahvistus"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Käyttäjä"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "SMS vahvistus"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "SMS vahvistus"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "SMS vahvistus"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Palvelun ilmoitus"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS vahvistus"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5579,12 +5621,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Salasanan vaihto"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Salasanan vaihto"
@@ -5677,14 +5719,14 @@ msgstr "Koko nimi: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Kotipaikka: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Kotisivu: %s"
@@ -6178,8 +6220,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6205,7 +6254,7 @@ msgstr ""
"Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6213,13 +6262,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6241,30 +6290,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s päivitys"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS vahvistus"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s tönäisi sinua"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6281,13 +6330,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Uusi yksityisviesti käyttäjältä %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6307,13 +6356,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s lisäsi päivityksesi suosikkeihinsa"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6335,7 +6384,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6343,13 +6392,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6386,7 +6435,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr " lähteestä "
@@ -6546,25 +6595,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Ei sisältöä!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Luotu"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Vastaa tähän päivitykseen"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Vastaus"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Päivitys on poistettu."
@@ -6639,7 +6688,7 @@ msgstr "Lähettämäsi viestit"
msgid "Tags in %s's notices"
msgstr "Tagit käyttäjän %s päivityksissä"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "Tuntematon toiminto"
@@ -6678,7 +6727,7 @@ msgstr ""
msgid "All groups"
msgstr "Kaikki ryhmät"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6702,7 +6751,7 @@ msgstr "Esittelyssä"
msgid "Popular"
msgstr "Suosituimmat"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Ei id parametria."
@@ -6726,7 +6775,7 @@ msgstr "Vastaa tähän päivitykseen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6830,6 +6879,51 @@ msgstr ""
msgid "None"
msgstr "Ei mitään"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Profiilikuvan päivittäminen epäonnistui."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Eniten päivityksiä"
@@ -6916,56 +7010,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "noin minuutti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "noin tunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "noin päivä sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "noin kuukausi sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 1d2bbcdae..5adb8b360 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
# Author@translatewiki.net: Julien C
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Peter17
+# Author@translatewiki.net: Y-M D
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -14,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:46+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:40+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -27,7 +28,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Accès"
@@ -89,24 +90,24 @@ msgid "Save"
msgstr "Enregistrer"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Page non trouvée."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -119,7 +120,7 @@ msgid "No such user."
msgstr "Utilisateur non trouvé."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s et ses amis, page %2$d"
@@ -127,33 +128,33 @@ msgstr "%1$s et ses amis, page %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s et ses amis"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Flux pour les amis de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Flux pour les amis de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Flux pour les amis de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -161,7 +162,7 @@ msgstr ""
"Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le "
"moment."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -171,7 +172,7 @@ msgstr ""
"(%%action.groups%%) ou de poster quelque chose vous-même."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -181,7 +182,7 @@ msgstr ""
"profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -191,58 +192,58 @@ msgstr ""
"un clin d’œil à %s ou poster un avis à son intention."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Vous et vos amis"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Statuts de %1$s et ses amis dans %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Méthode API non trouvée !"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Ce processus requiert un POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -250,7 +251,7 @@ msgstr ""
"Vous devez spécifier un paramètre « device » avec une des valeurs suivantes : "
"sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Impossible de mettre à jour l’utilisateur."
@@ -270,7 +271,7 @@ msgstr "Impossible d’enregistrer le profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -329,43 +330,43 @@ msgstr "Messages directs envoyés à %s"
msgid "All the direct messages sent to %s"
msgstr "Tous les messages directs envoyés à %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Message sans texte !"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Destinataire non trouvé."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
"comme amis."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Aucun statut trouvé avec cet identifiant. "
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Cet avis est déjà un favori."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Impossible de créer le favori."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Cet avis n’est pas un favori."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Impossible de supprimer le favori."
@@ -398,121 +399,121 @@ msgstr "Impossible de déterminer l’utilisateur source."
msgid "Could not find target user."
msgstr "Impossible de trouver l’utilisateur cible."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Les pseudos ne peuvent contenir que des caractères minuscules et des "
"chiffres, sans espaces."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Pseudo déjà utilisé. Essayez-en un autre."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Pseudo invalide."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "L’adresse du site personnel n’est pas un URL valide. "
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nom complet trop long (maximum de 255 caractères)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La description est trop longue (%d caractères maximum)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Emplacement trop long (maximum de 255 caractères)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Trop d’alias ! Maximum %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias invalide : « %s »."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "L’alias ne peut pas être le même que le pseudo."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Groupe non trouvé."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Vous êtes déjà membre de ce groupe."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Vous n’êtes pas membre de ce groupe."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Groupes de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Groupes de %1$s dont %2$s est membre."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Groupes de %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "groupes sur %s"
@@ -527,15 +528,15 @@ msgstr "Jeton incorrect."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -608,12 +609,12 @@ msgstr ""
"confiance."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -621,8 +622,8 @@ msgid "Nickname"
msgstr "Pseudo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Mot de passe"
@@ -638,11 +639,11 @@ msgstr "Autoriser"
msgid "Allow or deny access to your account information."
msgstr "Autoriser ou refuser l’accès à votre compte."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ce processus requiert un POST ou un DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
@@ -659,25 +660,25 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
msgid "Already repeated that notice."
msgstr "Vous avez déjà repris cet avis."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Statut supprimé."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Aucun statut trouvé avec cet identifiant."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trouvé."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -688,32 +689,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Format non supporté."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoris de %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s statuts favoris de %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Mises à jour mentionnant %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Activité publique %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statuts de tout le monde !"
@@ -728,12 +729,12 @@ msgstr "Repris pour %s"
msgid "Repeats of %s"
msgstr "Reprises de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Avis marqués avec %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mises à jour marquées avec %1$s dans %2$s !"
@@ -792,7 +793,7 @@ msgid "Preview"
msgstr "Aperçu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Supprimer"
@@ -832,11 +833,11 @@ msgstr "Avatar supprimé."
msgid "You already blocked that user."
msgstr "Vous avez déjà bloqué cet utilisateur."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -851,7 +852,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -860,7 +861,7 @@ msgstr "Non"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
@@ -869,7 +870,7 @@ msgstr "Ne pas bloquer cet utilisateur"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -877,11 +878,11 @@ msgid "Yes"
msgstr "Oui"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
@@ -1008,7 +1009,7 @@ msgstr "Vous n’êtes pas le propriétaire de cette application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -1042,7 +1043,7 @@ msgstr "Supprimer cette application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non connecté."
@@ -1073,7 +1074,7 @@ msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Supprimer cet avis"
@@ -1113,45 +1114,54 @@ msgstr "Conception"
msgid "Design settings for this StatusNet site."
msgstr "Paramètres de conception pour ce site StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL du logo invalide."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Le thème n’est pas disponible : %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Modifier le logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo du site"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Modifier le thème"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Thème du site"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Thème pour le site."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Thème personnalisé"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Changer l’image d’arrière plan"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Arrière plan"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1161,57 +1171,65 @@ msgstr ""
"maximale du fichier est de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Activé"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Désactivé"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 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:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Répéter l’image d’arrière plan"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifier les couleurs"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Contenu"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barre latérale"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texte"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Liens"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avancé"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "CSS personnalisé"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utiliser les valeurs par défaut"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurer les conceptions par défaut"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1221,7 +1239,7 @@ msgstr "Revenir aux valeurs par défaut"
msgid "Save"
msgstr "Enregistrer"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Sauvegarder la conception"
@@ -1493,7 +1511,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
@@ -1541,7 +1559,7 @@ msgstr "Cette adresse de messagerie électronique est erronée."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
msgid "Email confirmation cancelled."
-msgstr "Courrier électronique de confirmation annulé."
+msgstr "Confirmation de courrier électronique annulée."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1720,13 +1738,13 @@ msgstr "L’utilisateur a déjà ce rôle."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Aucun profil n’a été spécifié."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Aucun profil ne correspond à cet identifiant."
@@ -1868,7 +1886,7 @@ msgstr "Faire de cet utilisateur un administrateur"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Activité de %s"
@@ -2303,43 +2321,43 @@ msgstr "Vous n’êtes pas membre de ce groupe."
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Déjà connecté."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
"pas autorisé."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
"ordinateurs publics ou partagés)"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mot de passe perdu ?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2347,15 +2365,17 @@ msgstr ""
"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
"votre mot de passe afin d’enregistrer vos préférences."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Ouvrez une session avec un identifiant et un mot de passe."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n’avez "
-"pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau "
-"compte."
+"Vous n’avez pas encore d’identifiant ? [Créez-vous](%%action.register%%) un "
+"nouveau compte."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2562,30 +2582,30 @@ msgstr ""
"Les programmeurs peuvent modifier les paramètres d’enregistrement pour leurs "
"applications "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "L’avis n’a pas de profil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Statut de %1$s sur %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Type de contenu %s non supporté."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -2689,7 +2709,7 @@ msgid "6 or more characters"
msgstr "6 caractères ou plus"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmer"
@@ -2701,11 +2721,11 @@ msgstr "Identique au mot de passe ci-dessus"
msgid "Change"
msgstr "Modifier"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Votre mot de passe doit contenir au moins 6 caractères."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Les mots de passe ne correspondent pas."
@@ -2726,7 +2746,7 @@ msgid "Password saved."
msgstr "Mot de passe enregistré."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Chemins"
@@ -2932,43 +2952,43 @@ msgstr "Information de profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site personnel"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Décrivez vous et vos intérêts en %d caractères"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Décrivez vous et vos interêts"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Emplacement"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
@@ -3012,7 +3032,7 @@ msgstr ""
"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
"les utilisateurs non-humains)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
@@ -3277,7 +3297,7 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères."
msgid "Password and confirmation do not match."
msgstr "Le mot de passe et sa confirmation ne correspondent pas."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
@@ -3286,39 +3306,39 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Désolé, code d’invitation invalide."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Création de compte non autorisée."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Vous devez accepter les termes de la licence pour créer un compte."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Cette adresse courriel est déjà utilisée."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3326,36 +3346,60 @@ msgstr ""
"Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
"poster des avis and et vous relier à des amis et collègues. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 caractères ou plus. Requis."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Courriel"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilisé uniquement pour les mises à jour, les notifications, et la "
"récupération de mot de passe"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom plus long, votre \"vrai\" nom de préférence"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Je comprends que le contenu et les données de %1$s sont privés et "
+"confidentiels."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Tous droits réservés."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3365,7 +3409,7 @@ msgstr ""
"données personnelles : mot de passe, adresse électronique, adresse de "
"messagerie instantanée, numéro de téléphone."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3399,7 +3443,7 @@ msgstr ""
"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
"service."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3481,7 +3525,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
msgid "You already repeated that notice."
msgstr "Vous avez déjà repris cet avis."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repris"
@@ -3557,7 +3601,7 @@ msgstr "Vous ne pouvez pas révoquer les rôles des utilisateurs sur ce site."
msgid "User doesn't have this role."
msgstr "L'utilisateur ne possède pas ce rôle."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3572,7 +3616,7 @@ msgstr "L’utilisateur est déjà dans le bac à sable."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessions"
@@ -3615,7 +3659,7 @@ msgid "Icon"
msgstr "Icône"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nom"
@@ -3626,7 +3670,7 @@ msgid "Organization"
msgstr "Organisation"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Description"
@@ -4255,7 +4299,7 @@ msgstr "Aucun code entré"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Instantanés"
@@ -4613,7 +4657,7 @@ msgstr ""
"abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous "
"abonner aux avis de quelqu’un, cliquez « Rejeter »."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licence"
@@ -4745,18 +4789,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Statuts de %1$s dans %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4765,11 +4809,11 @@ msgstr ""
"Ce site est propulsé par %1$s, version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. et ses contributeurs."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Contributeurs"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4781,7 +4825,7 @@ msgstr ""
"GNU Affero telle qu’elle a été publiée par la Free Software Foundation, dans "
"sa version 3 ou (comme vous le souhaitez) toute version plus récente. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4793,7 +4837,7 @@ msgstr ""
"D’ADAPTATION À UN BUT PARTICULIER. Pour plus de détails, voir la Licence "
"Publique Générale GNU Affero."
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4802,20 +4846,20 @@ msgstr ""
"Vous avez dû recevoir une copie de la Licence Publique Générale GNU Affero "
"avec ce programme. Si ce n’est pas le cas, consultez %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Extensions"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Version"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Auteur(s)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4824,12 +4868,12 @@ msgstr ""
"Un fichier ne peut pas être plus gros que %d octets et le fichier que vous "
"avez envoyé pesait %d octets. Essayez d’importer une version moins grosse."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets."
@@ -4868,27 +4912,27 @@ msgid "Could not update message with new URI."
msgstr "Impossible de mettre à jour le message avec un nouvel URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques "
"minutes."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4896,28 +4940,28 @@ msgstr ""
"Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
"dans quelques minutes."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Il vous est interdit de poster des avis sur ce site."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr "Il vous avez été interdit de vous abonner."
+msgstr "Il vous a été interdit de vous abonner."
#: classes/Subscription.php:78
msgid "Already subscribed!"
@@ -5011,188 +5055,188 @@ msgid "Untitled page"
msgstr "Page sans nom"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personnel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Se connecter aux services"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administrer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Fermer la session"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Déconnexion"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Créer un compte"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "S'inscrire"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Connexion"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Aide"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Rechercher"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Notice du site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Vues locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Avis de la page"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Aide"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "À propos"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "CGU"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Confidentialité"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Source"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Insigne"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5202,13 +5246,13 @@ msgstr ""
"%site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** est un service de micro-blogging."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5220,20 +5264,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licence du contenu du site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5241,38 +5285,38 @@ msgstr ""
"réservés."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
"droits réservés."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Tous les contenus %1$s et les données sont disponibles sous la licence %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Avant"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Attendait un élément racine mais a reçu tout un document XML."
@@ -5280,11 +5324,11 @@ msgstr "Attendait un élément racine mais a reçu tout un document XML."
msgid "Can't handle remote content yet."
msgstr "Impossible de gérer le contenu distant pour le moment."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Impossible de gérer le contenu XML embarqué pour le moment."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment."
@@ -5315,64 +5359,64 @@ msgid "Unable to delete design setting."
msgstr "Impossible de supprimer les paramètres de conception."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configuration basique du site"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configuration de la conception"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Conception"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Configuration utilisateur"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Utilisateur"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Configuration d’accès"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configuration des chemins"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Configuration des sessions"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Modifier l'avis du site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Configuration des instantanés"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"La ressource de l’API a besoin de l’accès en lecture et en écriture, mais "
@@ -5506,11 +5550,11 @@ msgstr "Avis sur lesquels cette pièce jointe apparaît."
msgid "Tags for this attachment"
msgstr "Marques de cette pièce jointe"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "La modification du mot de passe a échoué"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "La modification du mot de passe n’est pas autorisée"
@@ -5592,9 +5636,9 @@ msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s"
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
+msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5604,14 +5648,14 @@ msgstr "Nom complet : %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Emplacement : %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Site Web : %s"
@@ -6155,8 +6199,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s suit maintenant vos avis sur %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Si vous pensez que ce compte est utilisé à des fins abusives, vous pouvez le "
+"bloquer de votre liste d'abonnés et le signaler comme spam aux "
+"administrateurs du site, sur %s."
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6182,19 +6236,19 @@ msgstr ""
"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio : %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nouvelle adresse courriel pour poster dans %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6216,31 +6270,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Statut de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s : confirmez que vous possédez ce numéro de téléphone grâce à ce code :"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Vous avez reçu un clin d’œil de %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6268,13 +6322,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nouveau message personnel de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6308,13 +6362,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) a ajouté un de vos avis à ses favoris"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6353,7 +6407,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6364,13 +6418,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) vous a envoyé un avis"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6433,7 +6487,7 @@ msgstr ""
"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
"vous envoyer des messages destinés à vous seul(e)."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "de"
@@ -6593,23 +6647,23 @@ msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
msgid "at"
msgstr "chez"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "dans le contexte"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repris par"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Répondre à cet avis"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Répondre"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Avis repris"
@@ -6682,7 +6736,7 @@ msgstr "Vos messages envoyés"
msgid "Tags in %s's notices"
msgstr "Marques dans les avis de %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Inconnu"
@@ -6719,7 +6773,7 @@ msgstr "Moyenne journalière"
msgid "All groups"
msgstr "Tous les groupes"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Méthode non implémentée."
@@ -6743,7 +6797,7 @@ msgstr "En vedette"
msgid "Popular"
msgstr "Populaires"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Aucun argument de retour."
@@ -6764,7 +6818,7 @@ msgstr "Reprendre cet avis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Révoquer le rôle « %s » de cet utilisateur"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
@@ -6862,6 +6916,54 @@ msgstr "Nuage de marques pour une personne"
msgid "None"
msgstr "Aucun"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"Le serveur ne peut pas gérer l’import de thèmes sans le support du format "
+"ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Le thème est manquant ou son import a échoué."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "L’enregistrement du thème a échoué."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Thème invalide : mauvaise arborescence."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Le thème importé est trop volumineux. Non compressé, il doit occuper moins "
+"de %d octets."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Archive de thème invalide : fichier css/display.css manquant"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Le thème contient un nom de fichier ou de dossier invalide. Limitez-vous aux "
+"lettres ASCII et aux chiffres, caractère de soulignement et signe moins."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "Le thème contient un fichier de type « .%s », qui n'est pas autorisé."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Erreur lors de l’ouverture de l’archive du thème."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Utilisateurs les plus actifs"
@@ -6942,56 +7044,56 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "il y a 1 minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "il y a 1 heure"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "il y a 1 jour"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "il y a 1 mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 7504570c1..ac7ad1b5f 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:50+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:45+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Aceptar"
@@ -92,25 +92,25 @@ msgid "Save"
msgstr "Gardar"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Non existe a etiqueta."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -123,7 +123,7 @@ msgid "No such user."
msgstr "Ningún usuario."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s e amigos"
@@ -131,39 +131,39 @@ msgstr "%s e amigos"
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s e amigos"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Fonte para os amigos de %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Fonte para os amigos de %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Fonte para os amigos de %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -171,14 +171,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -186,66 +186,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s e amigos"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións dende %1$s e amigos en %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Método da API non atopado"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Este método require un POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Non se puido actualizar o usuario."
@@ -267,7 +267,7 @@ msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -327,45 +327,45 @@ msgstr "Mensaxes directas para %s"
msgid "All the direct messages sent to %s"
msgstr "Tódalas mensaxes directas enviadas a %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Non hai mensaxes de texto!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Usuario destinatario non atopado."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Non se atopou un estado con ese ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Este chío xa é un favorito!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Non se puido crear o favorito."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
#, fuzzy
msgid "That status is not a favorite."
msgstr "Este chío non é un favorito!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Non se puido eliminar o favorito."
@@ -404,120 +404,120 @@ msgstr "Non se pudo recuperar a liña de tempo publica."
msgid "Could not find target user."
msgstr "Non se puido atopar ningún estado"
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Non é un alcume válido."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "A páxina persoal semella que non é unha URL válida."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é demasiado longo (max 255 car)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "A localización é demasiado longa (max 255 car.)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Etiqueta inválida: '%s'"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Método da API non atopado"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Xa estas suscrito a estes usuarios:"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Non estás suscrito a ese perfil"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "Usuarios"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1s non é unha orixe fiable."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, fuzzy, php-format
msgid "groups on %s"
msgstr "Outras opcions"
@@ -533,15 +533,15 @@ msgstr "Tamaño inválido."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -605,13 +605,13 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
#, fuzzy
msgid "Account"
msgstr "Sobre"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +619,8 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasinal"
@@ -637,11 +637,11 @@ msgstr "Todos"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método require un POST ou DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Non deberías eliminar o estado de outro usuario"
@@ -660,27 +660,27 @@ msgstr "Non se pode activar a notificación."
msgid "Already repeated that notice."
msgstr "Eliminar chío"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "Avatar actualizado."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Non existe ningún estado con esa ID atopada."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -690,32 +690,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato de ficheiro de imaxe non soportado."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s updates favorited by %s / %s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Chíos que respostan a %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Liña de tempo pública de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s chíos de calquera!"
@@ -730,12 +730,12 @@ msgstr "Replies to %s"
msgid "Repeats of %s"
msgstr "Replies to %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Chíos tagueados con %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizacións dende %1$s en %2$s!"
@@ -795,7 +795,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -839,11 +839,11 @@ msgstr "Avatar actualizado."
msgid "You already blocked that user."
msgstr "Xa bloqueaches a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -858,7 +858,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -868,7 +868,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Bloquear usuario"
@@ -878,7 +878,7 @@ msgstr "Bloquear usuario"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -887,12 +887,12 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Erro ao gardar información de bloqueo."
@@ -1027,7 +1027,7 @@ msgstr "Non estás suscrito a ese perfil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -1062,7 +1062,7 @@ msgstr "Eliminar chío"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non está logueado."
@@ -1095,7 +1095,7 @@ msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chíos."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chío"
@@ -1138,50 +1138,59 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Tamaño inválido."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Cambiar contrasinal"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "Invitar"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Modificado"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Novo chío"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Novo chío"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1189,61 +1198,69 @@ msgid ""
msgstr "Podes actualizar a túa información do perfil persoal aquí"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Cambiar contrasinal"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Conectar"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Buscar"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Lista"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1253,7 +1270,7 @@ msgstr ""
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1551,7 +1568,7 @@ msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
@@ -1789,13 +1806,13 @@ msgstr "O usuario bloqueoute."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Non se especificou ningún perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Non se atopou un perfil con ese ID."
@@ -1942,7 +1959,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Liña de tempo de %s"
@@ -2370,40 +2387,40 @@ msgstr "Non estás suscrito a ese perfil"
msgid "%1$s left group %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sesión xa iniciada"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Usuario ou contrasinal incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrarme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "¿Perdeches a contrasinal?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2411,11 +2428,15 @@ msgstr ""
"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
"contrasinal antes de cambiar as túas preferenzas."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Accede co teu nome de usuario e contrasinal."
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]"
"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
@@ -2624,31 +2645,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "O chío non ten perfil"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "Conectar"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -2760,7 +2781,7 @@ msgid "6 or more characters"
msgstr "6 ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2772,11 +2793,11 @@ msgstr "Igual que a contrasinal de enriba"
msgid "Change"
msgstr "Modificado"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "A contrasinal debe ter 6 caracteres ou máis."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "As contrasinais non coinciden"
@@ -2797,7 +2818,7 @@ msgid "Password saved."
msgstr "Contrasinal gardada."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -3015,44 +3036,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localización"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
@@ -3096,7 +3117,7 @@ msgstr ""
"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
"non humáns)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
@@ -3355,7 +3376,7 @@ msgstr "A contrasinal debe ter 6 caracteres ou máis."
msgid "Password and confirmation do not match."
msgstr "A contrasinal e a súa confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Acounteceu un erro configurando o usuario."
@@ -3363,40 +3384,40 @@ msgstr "Acounteceu un erro configurando o usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpa, só se pode rexistrar a xente con invitación."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Acounteceu un erro co código de confirmación."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Non se permite o rexistro neste intre."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "O enderezo de correo xa existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Usuario ou contrasinal inválidos."
-#: actions/register.php:343
+#: actions/register.php:350
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
@@ -3406,36 +3427,58 @@ msgstr ""
"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
"puntuación. Requerido."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Requerido."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo Electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3444,7 +3487,7 @@ msgstr ""
" agás esta informción privada: contrasinal, dirección de correo electrónico, "
"dirección IM, número de teléfono."
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3476,7 +3519,7 @@ msgstr ""
"\n"
"Grazas por rexistrarte e esperamos que laretexes moito."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3565,7 +3608,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
msgid "You already repeated that notice."
msgstr "Xa bloqueaches a este usuario."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Crear"
@@ -3637,7 +3680,7 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "User doesn't have this role."
msgstr "Usuario sen un perfil que coincida."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Avatar actualizado."
@@ -3654,7 +3697,7 @@ msgstr "O usuario bloqueoute."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3700,7 +3743,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3713,7 +3756,7 @@ msgid "Organization"
msgstr "Invitación(s) enviada(s)."
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
@@ -4345,7 +4388,7 @@ msgstr "Non se inseriu ningún código"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4708,7 +4751,7 @@ msgstr ""
"user's notices. If you didn't just ask to subscribe to someone's notices, "
"click \"Cancel\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4840,29 +4883,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Actualizacións dende %1$s en %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Estatísticas"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4870,7 +4913,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4878,40 +4921,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "Persoal"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4955,28 +4998,28 @@ msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe coa nova URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Erro ó inserir o hashtag na BD: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4985,22 +5028,22 @@ msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chío."
#. 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:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5111,57 +5154,57 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Navegación de subscricións"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
@@ -5170,71 +5213,71 @@ msgstr ""
"este servizo."
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear nova conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Rexistrar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5242,74 +5285,74 @@ msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Preguntas frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5319,13 +5362,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é un servizo de microbloguexo."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5337,57 +5380,57 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
#, fuzzy
msgid "After"
msgstr "« Despois"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "Antes »"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5395,11 +5438,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5435,74 +5478,74 @@ msgid "Unable to delete design setting."
msgstr "Non se puideron gardar os teus axustes de Twitter!"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Confirmar correo electrónico"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Invitar"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "Confirmación de SMS"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Persoal"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "Confirmación de SMS"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuario"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "Confirmación de SMS"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "Confirmación de SMS"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "Confirmación de SMS"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Novo chío"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "Confirmación de SMS"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5638,12 +5681,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Contrasinal gardada."
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Contrasinal gardada."
@@ -5740,14 +5783,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Ubicación: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Páxina persoal: %s"
@@ -6297,8 +6340,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está a escoitar os teus chíos %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6320,19 +6370,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Ubicación: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nova dirección de email para posterar en %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6354,30 +6404,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmación de SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Agardando a confirmación neste número de teléfono."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s douche un toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6404,13 +6454,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s enviouche unha nova mensaxe privada"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6444,13 +6494,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s gustoulle o teu chío"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6484,7 +6534,7 @@ msgstr ""
"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6492,13 +6542,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6535,7 +6585,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr " dende "
@@ -6698,27 +6748,27 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Sen contido!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
#, fuzzy
msgid "Reply to this notice"
msgstr "Non se pode eliminar este chíos."
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "contestar"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Chío publicado"
@@ -6796,7 +6846,7 @@ msgstr "As túas mensaxes enviadas"
msgid "Tags in %s's notices"
msgstr "O usuario non ten último chio."
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "Acción descoñecida"
@@ -6837,7 +6887,7 @@ msgstr ""
msgid "All groups"
msgstr "Tódalas etiquetas"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6862,7 +6912,7 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Non hai argumento id."
@@ -6886,7 +6936,7 @@ msgstr "Non se pode eliminar este chíos."
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6994,6 +7044,51 @@ msgstr ""
msgid "None"
msgstr "No"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Acounteceu un fallo ó actualizar o avatar."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Acounteceu un erro actualizando o perfil remoto"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -7083,56 +7178,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fai un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fai unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fai un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fai un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index a63edfbb0..14cbd03c7 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:53+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:49+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Acceso"
@@ -84,24 +84,24 @@ msgid "Save"
msgstr "Gardar"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Esa páxina non existe."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -114,7 +114,7 @@ msgid "No such user."
msgstr "Non existe tal usuario."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amigos, páxina %2$d"
@@ -122,40 +122,40 @@ msgstr "%1$s e amigos, páxina %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s e amigos"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Fonte de novas dos amigos de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Fonte de novas dos amigos de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Fonte de novas dos amigos de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
"Esta é a liña do tempo de %s e amigos pero ninguén publicou nada aínda."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -165,7 +165,7 @@ msgstr ""
"publique algo."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -175,7 +175,7 @@ msgstr ""
"[publicar algo dirixido a el ou ela](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,58 +185,58 @@ msgstr ""
"un aceno a %s ou publicar unha nota dirixida a el ou ela?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Vostede e mailos seus amigos"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións de %1$s e amigos en %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Non se atopou o método da API."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Este método require un POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -244,7 +244,7 @@ msgstr ""
"Ten que especificar un parámetro chamado \"device\" cun destes valores: sms, "
"im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Non se puido actualizar o usuario."
@@ -264,7 +264,7 @@ msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -323,43 +323,43 @@ msgstr "Mensaxes directas a %s"
msgid "All the direct messages sent to %s"
msgstr "Todas as mensaxes directas enviadas a %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "A mensaxe non ten texto!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Non se atopou o destinatario."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Non se atopou ningún estado con esa ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Este estado xa é dos favoritos."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Non se puido crear o favorito."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Ese estado non é un dos favoritos."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Non se puido eliminar o favorito."
@@ -392,121 +392,121 @@ msgstr "Non se puido determinar o usuario de orixe."
msgid "Could not find target user."
msgstr "Non se puido atopar o usuario de destino."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
"en branco."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "O formato do alcume non é correcto."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "O URL da páxina persoal non é correcto."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "A descrición é longa de máis (o máximo son %d caracteres)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Demasiados pseudónimos! O número máximo é %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Pseudónimo incorrecto: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "O pseudónimo non pode coincidir co alcume."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Non se atopou o grupo."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Xa forma parte dese grupo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "O administrador bloqueouno nese grupo."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Vostede non pertence a este grupo."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Os grupos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Grupos de %1$s aos que pertence %2$s."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "grupos %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "grupos en %s"
@@ -521,15 +521,15 @@ msgstr "Pase incorrecto."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -597,12 +597,12 @@ msgstr ""
"acceso á súa conta %4$s a xente de confianza."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasinal"
@@ -627,11 +627,11 @@ msgstr "Permitir"
msgid "Allow or deny access to your account information."
msgstr "Permitir ou denegar o acceso á información da súa conta."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método require un POST ou un DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Non pode borrar o estado doutro usuario."
@@ -648,25 +648,25 @@ msgstr "Non pode repetir a súa propia nota."
msgid "Already repeated that notice."
msgstr "Xa repetiu esa nota."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Borrouse o estado."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Non se atopou ningún estado con esa ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non se atopou."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -677,32 +677,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato non soportado."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritos de %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizacións marcadas como favoritas por %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualizacións que mencionan %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Liña do tempo pública de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizacións de todos!"
@@ -717,12 +717,12 @@ msgstr "Repetiu a %s"
msgid "Repeats of %s"
msgstr "Repeticións de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notas etiquetadas con %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizacións etiquetadas con %1$s en %2$s!"
@@ -781,7 +781,7 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Borrar"
@@ -821,11 +821,11 @@ msgstr "Borrouse o avatar."
msgid "You already blocked that user."
msgstr "Xa bloqueou ese usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear o usuario"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -840,7 +840,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -849,7 +849,7 @@ msgstr "Non"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloquear este usuario"
@@ -858,7 +858,7 @@ msgstr "Non bloquear este usuario"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -866,11 +866,11 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Non se puido gardar a información do bloqueo."
@@ -997,7 +997,7 @@ msgstr "Non é o dono desa aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Houbo un problema co seu pase."
@@ -1031,7 +1031,7 @@ msgstr "Borrar a aplicación"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non iniciou sesión."
@@ -1062,7 +1062,7 @@ msgid "Do not delete this notice"
msgstr "Non borrar esta nota"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Borrar esta nota"
@@ -1102,45 +1102,54 @@ msgstr "Deseño"
msgid "Design settings for this StatusNet site."
msgstr "Configuración do deseño deste sitio StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL do logo incorrecto."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "O tema visual non está dispoñible: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Cambiar o logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo do sitio"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Cambar o tema visual"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Tema visual do sitio"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema visual para o sitio."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Tema visual personalizado"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Cambiar a imaxe de fondo"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1150,57 +1159,65 @@ msgstr ""
"ficheiro é de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Activado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivado"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar ou desactivar a imaxe de fondo."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Imaxe de fondo en mosaico"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar as cores"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Contido"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Ligazóns"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "CSS personalizado"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilizar os valores por defecto"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar o deseño por defecto"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Volver ao deseño por defecto"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1210,7 +1227,7 @@ msgstr "Volver ao deseño por defecto"
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Gardar o deseño"
@@ -1487,7 +1504,7 @@ msgid "Cannot normalize that email address"
msgstr "Non se pode normalizar ese enderezo de correo electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "O enderezo de correo electrónico é incorrecto."
@@ -1713,13 +1730,13 @@ msgstr "O usuario xa ten este rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Non se especificou ningún perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ningún perfil ten esa ID."
@@ -1860,7 +1877,7 @@ msgstr "Converter a este usuario en administrador"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Liña do tempo de %s"
@@ -2231,8 +2248,8 @@ msgid ""
msgstr ""
"%1$s convidouno a unirse a el en %2$s (%3$s).\n"
"\n"
-"%2$s é un servizo de microblogging que lle permite estar ao día coas persoas "
-"que coñece e coas que lle interesen.\n"
+"%2$s é un servizo de mensaxes de blogue curtas que lle permite estar ao día "
+"coas persoas que coñece e coas que lle interesen.\n"
"\n"
"Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con "
"outros coñecidos. Tamén está moi ben para coñecer xente con intereses "
@@ -2285,43 +2302,43 @@ msgstr "Non pertence a ese grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Xa se identificou."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de usuario ou contrasinal incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
"para facelo."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Identificarse"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Identificarse no sitio"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrádeme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Identificarse automaticamente no futuro. Non se aconsella en computadoras "
"compartidas!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Esqueceu ou perdeu o contrasinal?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2329,14 +2346,17 @@ msgstr ""
"Por razóns de seguridade, volva introducir o seu nome de usuario e "
"contrasinal antes de cambiar a súa configuración."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Identifíquese co seu nome de usuario e contrasinal."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Identifíquese co seu nome de usuario e contrasinal. Aínda non ten un nome de "
-"usuario? [Rexistre](%%action.register%%) unha conta nova."
+"Aínda non ten un nome de usuario? [Rexistre](%%action.register%%) unha conta "
+"nova."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2538,30 +2558,30 @@ msgstr ""
"Os desenvolvedores poden editar a configuración de rexistro das súas "
"aplicacións "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Non hai perfil para a nota."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Non se soporta o tipo de contido %s."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Só %s enderezos URL sobre HTTP simple."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Non se soporta ese formato de datos."
@@ -2667,7 +2687,7 @@ msgid "6 or more characters"
msgstr "Seis ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2679,11 +2699,11 @@ msgstr "Igual ao contrasinal anterior"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "O contrasinal debe conter seis ou máis caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Os contrasinais non coinciden."
@@ -2704,7 +2724,7 @@ msgid "Password saved."
msgstr "Gardouse o contrasinal."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Rutas"
@@ -2910,43 +2930,43 @@ msgstr ""
"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
"espazos, tiles ou eñes"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descríbase a vostede e mailos seus intereses en %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descríbase a vostede e mailos seus intereses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografía"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Lugar"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), paísâ€"
@@ -2990,7 +3010,7 @@ msgstr ""
"Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
"bots)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "A biografía é longa de máis (o límite son %d caracteres)."
@@ -3088,11 +3108,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/"
-"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]"
-"(http://status.net/). [Únase agora](%%action.register%%) para compartir "
-"notas persoais cos amigos, a familia e os compañeiros! ([Ler máis](%%doc.help"
-"%%))"
+"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en."
+"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
+"software libre [StatusNet](http://status.net/). [Únase agora](%%action."
+"register%%) para compartir notas persoais cos amigos, a familia e os "
+"compañeiros! ([Máis información](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3101,9 +3121,9 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/"
-"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]"
-"(http://status.net/)."
+"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en."
+"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
+"software libre [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -3258,7 +3278,7 @@ msgstr "O contrasinal debe ter seis ou máis caracteres."
msgid "Password and confirmation do not match."
msgstr "O contrasinal e a confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Houbo un erro ao configurar o usuario."
@@ -3266,39 +3286,39 @@ msgstr "Houbo un erro ao configurar o usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Só se pode rexistrar mediante invitación."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "O código da invitación é incorrecto."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rexistrouse correctamente"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrarse"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Non se permite o rexistro."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Non pode rexistrarse se non acepta a licenza."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "O enderezo de correo electrónico xa existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "O nome de usuario ou contrasinal non son correctos."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3306,36 +3326,61 @@ msgstr ""
"Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
"e porse en contacto con amigos e compañeiros. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
"espazos, tiles ou eñes. Obrigatorio."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Obrigatorio."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome longo, preferiblemente o seu nome \"real\""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+"Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+"Os meus textos e ficheiros están protexidos polos meus propios dereitos de "
+"autor."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Todos os dereitos reservados."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3345,7 +3390,7 @@ msgstr ""
"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
"instantánea e números de teléfono."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3377,7 +3422,7 @@ msgstr ""
"\n"
"Grazas por rexistrarse. Esperamos que goce deste servizo."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3394,8 +3439,8 @@ msgid ""
msgstr ""
"Para subscribirse, pode [identificarse](%%action.login%%) ou [rexistrar](%%"
"action.register%%) unha conta nova. Se xa ten unha conta nun [sitio de "
-"microblogging compatible](%%doc.openmublog%%), introduza a continuación o "
-"URL do seu perfil."
+"mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a "
+"continuación o URL do seu perfil."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
@@ -3419,7 +3464,8 @@ msgstr "URL do perfil"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL do seu perfil noutro servizo de microblogging compatible"
+msgstr ""
+"URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
@@ -3460,7 +3506,7 @@ msgstr "Non pode repetir a súa propia nota."
msgid "You already repeated that notice."
msgstr "Xa repetiu esa nota."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetida"
@@ -3509,6 +3555,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Pode conversar con outros usuarios, subscribirse a máis xente ou [unirse a "
+"grupos](%%action.groups%%)."
#: actions/replies.php:206
#, php-format
@@ -3516,174 +3564,182 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+"Pode probar a [facerlle un aceno a %1$s](../%2$s) ou [publicar algo dirixido "
+"a el ou ela](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "Respostas a %1$s en %2$s!"
#: actions/revokerole.php:75
msgid "You cannot revoke user roles on this site."
-msgstr ""
+msgstr "Non pode revogar os roles dos usuarios neste sitio."
#: actions/revokerole.php:82
msgid "User doesn't have this role."
-msgstr ""
+msgstr "O usuario non ten este rol."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
-msgstr ""
+msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
-msgstr ""
+msgstr "Non pode illar usuarios neste sitio."
#: actions/sandbox.php:72
msgid "User is already sandboxed."
-msgstr ""
+msgstr "O usuario xa está illado."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
-msgstr ""
+msgstr "Sesións"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "Configuración da sesión para este sitio StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
-msgstr ""
+msgstr "Manexar as sesións"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Manexar ou non as sesións nós mesmos."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "Depuración da sesión"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr ""
+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 ""
+msgstr "Gardar a configuración do sitio"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "Debe estar identificado para ver unha aplicación."
#: actions/showapplication.php:157
msgid "Application profile"
-msgstr ""
+msgstr "Perfil da aplicación"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Icona"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
-msgstr ""
+msgstr "Nome"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
msgid "Organization"
-msgstr ""
+msgstr "Organización"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
-msgstr ""
+msgstr "Descrición"
#: actions/showapplication.php:192 actions/showgroup.php:444
#: lib/profileaction.php:187
msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Accións da aplicación"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Restablecer o contrasinal ou a pregunta secreta"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Información da aplicación"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Clave do consumidor"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Pregunta secreta do consumidor"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "Solicitar un URL de pase"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "Acceder ao URL do pase"
#: actions/showapplication.php:283
msgid "Authorize URL"
-msgstr ""
+msgstr "Autorizar o URL"
#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
+"con texto sinxelo."
#: actions/showapplication.php:309
msgid "Are you sure you want to reset your consumer key and secret?"
msgstr ""
+"Seguro que quere restablecer a súa clave e maila súa pregunta secreta de "
+"consumidor?"
#: actions/showfavorites.php:79
#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
+msgstr "Notas favoritas de %1$s, páxina %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Non se puideron obter as notas favoritas."
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas dos favoritos de %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas dos favoritos de %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr ""
+msgstr "Fonte de novas dos favoritos de %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Aínda non escolleu ningunha nota favorita. Prema no botón de nota favorita "
+"naquelas notas que lle gusten para marcalas para logo ou para salientalas."
#: actions/showfavorites.php:208
#, php-format
@@ -3691,6 +3747,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s aínda non marcou ningunha nota como favorita. Publique algo interesante "
+"que poida querer engadir aos seus favoritos :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3699,80 +3757,83 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s aínda non marcou ningunha nota como favorita. Por que non [rexistrar unha "
+"conta](%%%%action.register%%%%) e publicar algo interesante que puidese "
+"querer engadir aos seus favoritos? :)"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Isto é un modo de compartir o que lle gusta."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "Grupo %s"
#: actions/showgroup.php:84
#, php-format
msgid "%1$s group, page %2$d"
-msgstr ""
+msgstr "Grupo %1$s, páxina %2$d"
#: actions/showgroup.php:227
msgid "Group profile"
-msgstr ""
+msgstr "Perfil do grupo"
#: actions/showgroup.php:272 actions/tagother.php:118
#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
-msgstr ""
+msgstr "URL"
#: actions/showgroup.php:283 actions/tagother.php:128
#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
-msgstr ""
+msgstr "Nota"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Pseudónimos"
#: actions/showgroup.php:302
msgid "Group actions"
-msgstr ""
+msgstr "Accións do grupo"
#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)"
#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)"
#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Fonte de novas das notas do grupo %s (Atom)"
#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
-msgstr ""
+msgstr "Amigo dun amigo para o grupo %s"
#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
-msgstr ""
+msgstr "Membros"
#: actions/showgroup.php:398 lib/profileaction.php:117
#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
-msgstr ""
+msgstr "(Ningún)"
#: actions/showgroup.php:404
msgid "All members"
-msgstr ""
+msgstr "Todos os membros"
#: actions/showgroup.php:447
msgid "Created"
-msgstr ""
+msgstr "Creado"
#: actions/showgroup.php:463
#, php-format
@@ -3783,6 +3844,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
+"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
+"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
+"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo "
+"e de moitos máis! ([Máis información](%%%%doc.help%%%%))"
#: actions/showgroup.php:469
#, php-format
@@ -3792,78 +3859,84 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
+"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
+"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
#: actions/showgroup.php:497
msgid "Admins"
-msgstr ""
+msgstr "Administradores"
#: actions/showmessage.php:81
msgid "No such message."
-msgstr ""
+msgstr "Non se atopou esa mensaxe."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Esta mensaxe só a poden ler o destinatario e mais o remitente."
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Mensaxe a %1$s en %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Mensaxe de %1$s en %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr ""
+msgstr "Borrouse a nota."
#: actions/showstream.php:73
#, php-format
msgid " tagged %s"
-msgstr ""
+msgstr " etiquetouse %s"
#: actions/showstream.php:79
#, php-format
msgid "%1$s, page %2$d"
-msgstr ""
+msgstr "%1$s, páxina %2$d"
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "Fonte de novas das notas para %s (Atom)"
#: actions/showstream.php:148
#, php-format
msgid "FOAF for %s"
-msgstr ""
+msgstr "Amigo dun amigo para %s"
#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
+msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"Viu algo interesante hoxe? Aínda non publicou ningunha nota, este sería un "
+"bo momento para comezar :)"
#: actions/showstream.php:207
#, php-format
@@ -3871,6 +3944,8 @@ msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
+"Pode probar a facerlle un aceno a %1$s ou [publicar algo dirixido a el ou "
+"ela](%%%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3880,6 +3955,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
+"[Únase agora](%%%%action.register%%%%) para seguir as notas de **%s** e de "
+"moita máis xente! ([Máis información](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3888,191 +3968,199 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
-msgstr ""
+msgstr "Repeticións de %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "Non pode silenciar usuarios neste sitio."
#: actions/silence.php:72
msgid "User is already silenced."
-msgstr ""
+msgstr "O usuario xa está silenciado."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site"
-msgstr ""
+msgstr "Configuración básica para este sitio StatusNet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "O nome do sitio non pode quedar baleiro."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
-msgstr ""
+msgstr "Ten que ter un enderezo de correo electrónico de contacto correcto."
#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Non se coñece a lingua \"%s\"."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "O límite mínimo de texto é 0 (ilimitado)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
-msgstr ""
+msgstr "O tempo límite de repetición debe ser de 1 ou máis segundos."
#: actions/siteadminpanel.php:221
msgid "General"
-msgstr ""
+msgstr "Xeral"
#: actions/siteadminpanel.php:224
msgid "Site name"
-msgstr ""
+msgstr "Nome do sitio"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
+"O nome do seu sitio, como por exemplo \"O sitio de mensaxes de blogue curtas "
+"da miña empresa\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
-msgstr ""
+msgstr "Publicado por"
#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina"
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "URL do publicador"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina"
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "Enderezo de correo electrónico de contacto para o seu sitio"
#: actions/siteadminpanel.php:245
msgid "Local"
-msgstr ""
+msgstr "Local"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
-msgstr ""
+msgstr "Fuso horario por defecto"
#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Fuso horario por defecto para este sitio. Adoita poñerse o UTC."
#: actions/siteadminpanel.php:262
msgid "Default language"
-msgstr ""
+msgstr "Lingua por defecto"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Lingua do sitio para cando a detección automática a partir do navegador non "
+"sexa posible"
#: actions/siteadminpanel.php:271
msgid "Limits"
-msgstr ""
+msgstr "Límites"
#: actions/siteadminpanel.php:274
msgid "Text limit"
-msgstr ""
+msgstr "Límite de texto"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Número máximo de caracteres para as notas."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
-msgstr ""
+msgstr "Tempo límite de repetición"
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Tempo (en segundos) que teñen que agardar os usuarios para publicar unha "
+"nota de novo."
#: actions/sitenoticeadminpanel.php:56
msgid "Site Notice"
-msgstr ""
+msgstr "Nota do sitio"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
-msgstr ""
+msgstr "Editar a mensaxe global do sitio"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
-msgstr ""
+msgstr "Non se puido gardar a nota do sitio."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr ""
+msgstr "Texto da nota do sitio"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
+"Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
-msgstr ""
+msgstr "Gardar a nota do sitio"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
msgid "SMS settings"
-msgstr ""
+msgstr "Configuración dos SMS"
#. TRANS: SMS settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Pode recibir mensaxes SMS de %%site.name%% por correo electrónico."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:97
msgid "SMS is not available."
-msgstr ""
+msgstr "Os SMS non están dispoñibles."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Enderezo de mensaxería instantánea"
+msgstr "Enderezo dos SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Número de teléfono cos SMS activados confirmado actualmente."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Agardando pola confirmación do número de teléfono."
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:142
msgid "Confirmation code"
-msgstr ""
+msgstr "Código de confirmación"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Introduza o código que recibiu no teléfono."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirmar"
@@ -4080,18 +4168,19 @@ msgstr "Confirmar"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
msgid "SMS phone number"
-msgstr ""
+msgstr "Número de teléfono para os SMS"
#. TRANS: SMS phone number input field instructions in SMS settings form.
#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
+"Número de teléfono, sen signos de puntuación nin espazos en branco, co "
+"código da zona"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferencias"
+msgstr "Preferencias dos SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4099,32 +4188,33 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"Enviádeme notas por SMS. Comprendo que isto podería supoñerme uns custos "
+"exorbitantes na factura da miña compañía."
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Gardáronse as preferencias."
+msgstr "Gardáronse as preferencias dos SMS."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
msgid "No phone number."
-msgstr ""
+msgstr "Non hai ningún número de teléfono."
#. TRANS: Message given saving SMS phone number without having selected a carrier.
#: actions/smssettings.php:344
msgid "No carrier selected."
-msgstr ""
+msgstr "Non se escolleu unha compañía."
#. TRANS: Message given saving SMS phone number that is already set.
#: actions/smssettings.php:352
msgid "That is already your phone number."
-msgstr ""
+msgstr "Ese xa é o seu número de teléfono."
#. TRANS: Message given saving SMS phone number that is already set for another user.
#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Ese número de teléfono xa pertence a outro usuario."
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
#: actions/smssettings.php:384
@@ -4132,39 +4222,39 @@ msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
+"Enviouse un código de confirmación ao número de teléfono que engadiu. "
+"Comprobe no seu teléfono o código e as instrucións para utilizalo."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Ese número de confirmación é incorrecto."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Cancelouse a confirmación."
+msgstr "Cancelouse a confirmación para os SMS."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
#: actions/smssettings.php:448
msgid "That is not your phone number."
-msgstr ""
+msgstr "Ese número de teléfono non é seu."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Borrouse o enderezo."
+msgstr "Borrouse o número de teléfono para os SMS."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
-msgstr ""
+msgstr "Compañía"
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:516
msgid "Select a carrier"
-msgstr ""
+msgstr "Escolla unha compañía"
#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
#. TRANS: %s is an administrative contact's e-mail address.
@@ -4174,123 +4264,128 @@ msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
+"Compañía de telecomunicacións coa que contratou o seu móbil. Se sabe "
+"dalgunha compañía que permita SMS sobre correo electrónico pero non aparece "
+"nesta lista, envíenos un correo electrónico para notificárnolo a %s."
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
#: actions/smssettings.php:548
msgid "No code entered"
-msgstr ""
+msgstr "Non se introduciu ningún código"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
-msgstr ""
+msgstr "Instantáneas"
#: actions/snapshotadminpanel.php:65
msgid "Manage snapshot configuration"
-msgstr ""
+msgstr "Xestione a configuración das instantáneas"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Valor de execución da instantánea incorrecto."
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "A frecuencia das instantáneas debe ser un número."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL de envío das instantáneas incorrecto."
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
-msgstr ""
+msgstr "Ao chou durante o acceso á rede"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
-msgstr ""
+msgstr "Nun proceso programado"
#: actions/snapshotadminpanel.php:206
msgid "Data snapshots"
-msgstr ""
+msgstr "Instantáneas de datos"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Cando enviar información estatística aos servidores status.net"
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "As instantáneas enviaranse unha vez cada N accesos á rede"
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "URL de envío"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "As instantáneas enviaranse a este URL"
#: actions/snapshotadminpanel.php:248
msgid "Save snapshot settings"
-msgstr ""
+msgstr "Gardar a configuración das instantáneas"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "Non está subscrito a ese perfil."
#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
-msgstr ""
+msgstr "Non se puido gardar a subscrición."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Esta acción só permite solicitudes POST."
#: actions/subscribe.php:107
msgid "No such profile."
-msgstr ""
+msgstr "Non existe ese perfil."
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
+msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
#: actions/subscribe.php:145
msgid "Subscribed"
-msgstr ""
+msgstr "Subscrito"
#: actions/subscribers.php:50
#, php-format
msgid "%s subscribers"
-msgstr ""
+msgstr "%s subscritores"
#: actions/subscribers.php:52
#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr ""
+msgstr "%1$s subscritores, páxina %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "Estas son as persoas que seguen as súas notas."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "Estas son as persoas que están seguindo as notas de %s."
#: actions/subscribers.php:108
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"Non ten subscritores. Probe a subscribirse a xente que coñeza e pode que lle "
+"devolvan o favor"
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s non ten subscritores. Quere ser o primeiro?"
#: actions/subscribers.php:114
#, php-format
@@ -4298,25 +4393,27 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s non ten subscritores. Por que non [rexistrar unha conta](%%%%action."
+"register%%%%) e ser o primeiro?"
#: actions/subscriptions.php:52
#, php-format
msgid "%s subscriptions"
-msgstr ""
+msgstr "%s subscricións"
#: actions/subscriptions.php:54
#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr ""
+msgstr "%1$s subscricións, páxina %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Estas son as persoas cuxas notas segue."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "Estas son as persoas cuxas notas segue %s."
#: actions/subscriptions.php:126
#, php-format
@@ -4327,188 +4424,200 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Agora mesmo non está a seguir as notas de ninguén, probe a subscribirse a "
+"xente que coñeza. Intente [buscar xente](%%action.peoplesearch%%), buscar "
+"xente en grupos que lle interesen e nos nosos [usuarios destacados](%%action."
+"featured%%). Se é [usuario do Twitter](%%action.twittersettings%%), pode "
+"subscribirse automaticamente á xente que segue alí."
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr ""
+msgstr "%s non está seguindo a ninguén."
#: actions/subscriptions.php:208
msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "SMS"
#: actions/tag.php:69
#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
+msgstr "Notas etiquetadas con %1$s, páxina %2$d"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para a etiqueta %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para a etiqueta %s (RSS 2.0)"
#: actions/tag.php:99
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "Fonte de novas das notas para a etiqueta %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
-msgstr ""
+msgstr "Sen argumento ID."
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "Etiqueta %s"
#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
-msgstr ""
+msgstr "Perfil do usuario"
#: actions/tagother.php:81 actions/userauthorization.php:132
#: lib/userprofile.php:103
msgid "Photo"
-msgstr ""
+msgstr "Fotografía"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Etiquetar ao usuario"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
+"comas ou espazos en branco"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+"Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a "
+"vostede."
#: actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "Non se puideron gardar as etiquetas."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+"Utilice este formulario para engadir etiquetas aos seus subscritores ou "
+"subscricións."
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr ""
+msgstr "Esa etiqueta non existe."
#: actions/twitapitrends.php:85
msgid "API method under construction."
-msgstr ""
+msgstr "Método API en desenvolvemento."
#: actions/unblock.php:59
msgid "You haven't blocked that user."
-msgstr ""
+msgstr "Non bloqueou a ese usuario."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
-msgstr ""
+msgstr "O usuario non está illado."
#: actions/unsilence.php:72
msgid "User is not silenced."
-msgstr ""
+msgstr "O usuario non está silenciado."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "Non se solicitou ningún pase."
+msgstr "à solicitude fáltalle o ID do perfil."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "Cancelouse a subscrición"
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
+"A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa "
+"licenza deste sitio: \"%2$s\"."
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
msgctxt "TITLE"
msgid "User"
-msgstr ""
+msgstr "Usuario"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Preferencias de usuario para este sitio StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Límite da biografía incorrecto. Debe ser numérico."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+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
#: lib/personalgroupnav.php:109
msgid "Profile"
-msgstr ""
+msgstr "Perfil"
#: actions/useradminpanel.php:222
msgid "Bio Limit"
-msgstr ""
+msgstr "Límite da biografía"
#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Extensión máxima da biografía dun perfil en caracteres."
#: actions/useradminpanel.php:231
msgid "New users"
-msgstr ""
+msgstr "Novos usuarios"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "Nova benvida para os usuarios"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)."
#: actions/useradminpanel.php:241
msgid "Default subscription"
-msgstr ""
+msgstr "Subscrición por defecto"
#: actions/useradminpanel.php:242
msgid "Automatically subscribe new users to this user."
-msgstr ""
+msgstr "Subscribir automaticamente aos novos usuarios a este usuario."
#: actions/useradminpanel.php:251
msgid "Invitations"
-msgstr ""
+msgstr "Invitacións"
#: actions/useradminpanel.php:256
msgid "Invitations enabled"
-msgstr ""
+msgstr "Activáronse as invitacións"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "Autorizar a subscrición"
#: actions/userauthorization.php:110
msgid ""
@@ -4516,35 +4625,38 @@ msgid ""
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Rejectâ€."
msgstr ""
+"Verifique estes detalles para certificar que quere subscribirse ás notas "
+"deste usuario. Se non pediu a subscrición ás notas de alguén, prema en "
+"\"Rexeitar\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
-msgstr ""
+msgstr "Licenza"
#: actions/userauthorization.php:217
msgid "Accept"
-msgstr ""
+msgstr "Aceptar"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr ""
+msgstr "Subscribirse a este usuario"
#: actions/userauthorization.php:219
msgid "Reject"
-msgstr ""
+msgstr "Rexeitar"
#: actions/userauthorization.php:220
msgid "Reject this subscription"
-msgstr ""
+msgstr "Rexeitar esta subscrición"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "Non se solicitou a autorización!"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
-msgstr ""
+msgstr "Autorizouse a subscrición"
#: actions/userauthorization.php:256
msgid ""
@@ -4552,10 +4664,13 @@ msgid ""
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
+"Autorizouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada "
+"ás instrucións do sitio para saber máis sobre como autorizar a subscrición. "
+"O pase da súa subscrición é:"
#: actions/userauthorization.php:266
msgid "Subscription rejected"
-msgstr ""
+msgstr "Rexeitouse a subscrición"
#: actions/userauthorization.php:268
msgid ""
@@ -4563,761 +4678,797 @@ msgid ""
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
+"Rexeitouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada "
+"ás instrucións do sitio para obter máis información sobre como rexeitar "
+"completamente a subscrición."
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "O URI do seguidor, \"%s\", é longo de máis."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "O URI do seguidor, \"%s\", é dun usuario local."
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "O URL do avatar, \"%s\", é incorrecto."
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "Non se puido ler o URL do avatar, \"%s\"."
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr ""
+msgstr "Deseño do perfil"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de "
+"cores escollida por vostede."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Bo proveito!"
#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
#: actions/usergroups.php:66
#, php-format
msgid "%1$s groups, page %2$d"
-msgstr ""
+msgstr "%1$s grupos, páxina %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
-msgstr ""
+msgstr "Buscar máis grupos"
#: actions/usergroups.php:159
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "%s non pertence a ningún grupo."
#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles."
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom group notice feed.
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Actualizacións de %1$s en %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
-msgstr ""
+msgstr "%s de StatusNet"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
+"Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de "
+"StatusNet, Inc. e colaboradores, 2008-2010."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
-msgstr ""
+msgstr "Colaboradores"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet é software libre: pode redistribuílo e modificalo baixo os termos "
+"da Licenza Pública Xeral Affero de GNU, tal e como a publicou a Free "
+"Software Foundation, versión 3 ou calquera versión posterior (a elección do "
+"usuario) da licenza. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Este programa distribúese coa esperanza de que resulte útil, pero SEN "
+"NINGUNHA GARANTÃA, nin sequera as garantías implícitas de COMERCIALIZACIÓN "
+"ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral "
+"Affero de GNU para máis información. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co "
+"programa. En caso contrario, vexa %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
-msgstr ""
+msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
-msgstr ""
+msgstr "Versión"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
-msgstr ""
+msgstr "Autores"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Ningún ficheiro pode superar os %d bytes e o que enviou ocupaba %d. Probe a "
+"subir un ficheiro máis pequeno."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
+"Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
#: classes/Group_member.php:41
msgid "Group join failed."
-msgstr ""
+msgstr "Non se puido unir ao grupo."
#: classes/Group_member.php:53
msgid "Not part of group."
-msgstr ""
+msgstr "Non forma parte do grupo."
#: classes/Group_member.php:60
msgid "Group leave failed."
-msgstr ""
+msgstr "Non se puido deixar o grupo."
#: classes/Local_group.php:41
msgid "Could not update local group."
-msgstr ""
+msgstr "Non se puido actualizar o grupo local."
#: classes/Login_token.php:76
#, php-format
msgid "Could not create login token for %s"
-msgstr ""
+msgstr "Non se puido crear un pase de sesión para %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
-msgstr ""
+msgstr "Prohibíuselle enviar mensaxes directas de momento."
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Non se puido inserir a mensaxe."
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Non se puido actualizar a mensaxe co novo URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr ""
-"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
-"OAuth."
+msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Houbo un problema ao gardar a nota. É longa de máis."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
+"Escribiu demasiadas notas en moi pouco tempo. Tómese un respiro e volva "
+"publicar nuns minutos."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
+"Repetiu demasiadas mensaxes en moi pouco tempo. Tómese un respiro e volva "
+"publicar nuns minutos."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Prohibíuselle publicar notas neste sitio de momento."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
-msgstr ""
+msgstr "Houbo un problema ao gardar a nota."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
-msgstr ""
+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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "â™» @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "Prohibíuselle realizar subscricións de momento."
#: classes/Subscription.php:78
msgid "Already subscribed!"
-msgstr ""
+msgstr "Xa está subscrito!"
#: classes/Subscription.php:82
msgid "User has blocked you."
-msgstr ""
+msgstr "O usuario bloqueouno."
#: classes/Subscription.php:167
msgid "Not subscribed!"
-msgstr ""
+msgstr "Non está subscrito!"
#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
-msgstr ""
+msgstr "Non se puido borrar a subscrición a si mesmo."
#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr ""
+msgstr "Non se puido borrar o pase de subscrición OMB."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Non se puido borrar a subscrición."
#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Benvido a %1$s, @%2$s!"
#: classes/User_group.php:480
msgid "Could not create group."
-msgstr ""
+msgstr "Non se puido crear o grupo."
#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr ""
+msgstr "Non se puido establecer o URI do grupo."
#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr ""
+msgstr "Non se puido establecer a pertenza ao grupo."
#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr ""
+msgstr "Non se puido gardar a información do grupo local."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
-msgstr ""
+msgstr "Cambie a configuración do seu perfil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:116
msgid "Upload an avatar"
-msgstr ""
+msgstr "Cargue un avatar"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:123
msgid "Change your password"
-msgstr ""
+msgstr "Cambie o seu contrasinal"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
msgid "Change email handling"
-msgstr ""
+msgstr "Cambie a xestión do correo electrónico"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
msgid "Design your profile"
-msgstr ""
+msgstr "Deseñe o seu perfil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
msgid "Other options"
-msgstr ""
+msgstr "Outras opcións"
#. TRANS: Link description in user account settings menu.
#: lib/accountsettingsaction.php:146
msgid "Other"
-msgstr ""
+msgstr "Outros"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:145
#, php-format
msgid "%1$s - %2$s"
-msgstr ""
+msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
#: lib/action.php:161
msgid "Untitled page"
-msgstr ""
+msgstr "Páxina sen título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
-msgstr ""
+msgstr "Navegación principal do sitio"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Liña do tempo do perfil persoal e os amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
-msgstr ""
+msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr ""
+msgstr "Conectarse aos servizos"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
-msgstr ""
+msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr ""
+msgstr "Cambiar a configuración do sitio"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
-msgstr ""
+msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Convide a amigos e compañeiros a unírselle en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
-msgstr ""
+msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr ""
+msgstr "Saír ao anonimato"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
-msgstr ""
+msgstr "Saír"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
-msgstr ""
+msgstr "Crear unha conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
-msgstr ""
+msgstr "Rexistrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr ""
+msgstr "Identificarse no sitio"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
-msgstr ""
+msgstr "Identificarse"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
-msgstr ""
+msgstr "Axuda!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
-msgstr ""
+msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr ""
+msgstr "Buscar persoas ou palabras"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
-msgstr ""
+msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
-msgstr ""
+msgstr "Nota do sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
-msgstr ""
+msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
-msgstr ""
+msgstr "Nota da páxina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
-msgstr ""
+msgstr "Navegación secundaria do sitio"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
-msgstr ""
+msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
-msgstr ""
+msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
-msgstr ""
+msgstr "Preguntas máis frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
-msgstr ""
+msgstr "Condicións do servicio"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
-msgstr ""
+msgstr "Protección de datos"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
-msgstr ""
+msgstr "Código fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
-msgstr ""
+msgstr "Contacto"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
-msgstr ""
+msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
-msgstr ""
+msgstr "Licenza do software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
+"**%%site.name%%** é un servizo de mensaxes de blogue curtas ofrecido por [%%"
+"site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
+msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"Utiliza a versión %s do software de mensaxes de blogue curtas [StatusNet]"
+"(http://status.net/), dispoñible baixo a [Licenza Pública Xeral Affero de "
+"GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
-msgstr ""
+msgstr "Licenza dos contidos do sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "O contido e os datos de %1$s son privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
+"Os contidos e datos son propiedade intelectual de %1$s. Quedan reservados "
+"todos os dereitos."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
+"reservados todos os dereitos."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+"Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
msgid "Pagination"
-msgstr ""
+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:1193
+#: lib/action.php:1203
msgid "After"
-msgstr ""
+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:1203
+#: lib/action.php:1213
msgid "Before"
-msgstr ""
+msgstr "Anteriores"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "Aínda non é posible manexar contidos remotos."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Aínda non se poden manexar contidos XML integrados."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Aínda non se poden manexar contidos Base64."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Non pode realizar cambios neste sitio."
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
msgid "Changes to that panel are not allowed."
-msgstr ""
+msgstr "Non se permite realizar cambios nese panel."
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() non está integrado."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() non está integrado."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
#: lib/adminpanelaction.php:284
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Non se puido borrar a configuración do deseño."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
-msgstr ""
+msgstr "Configuración básica do sitio"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
-msgstr ""
+msgstr "Sitio"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
-msgstr ""
+msgstr "Configuración do deseño"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
-msgstr ""
+msgstr "Deseño"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
-msgstr ""
+msgstr "Configuración do usuario"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
-msgstr ""
+msgstr "Usuario"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
-msgstr ""
+msgstr "Configuración de acceso"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
-msgstr ""
+msgstr "Configuración das rutas"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
-msgstr ""
+msgstr "Configuración das sesións"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
-msgstr ""
+msgstr "Modificar a nota do sitio"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
-msgstr ""
+msgstr "Configuración das instantáneas"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"O recurso API precisa permisos de lectura e escritura, pero só dispón de "
+"permisos de lectura."
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "Modificar a aplicación"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Icona para esta aplicación"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
#, php-format
msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "Describa a súa aplicación en %d caracteres"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
msgid "Describe your application"
-msgstr ""
+msgstr "Describa a súa aplicación"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "URL do sitio web desta aplicación"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
msgid "Source URL"
-msgstr ""
+msgstr "URL de orixe"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organización responsable desta aplicación"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "URL do sitio web da organización"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL ao que ir tras a autenticación"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Navegador"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "Escritorio"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipo de aplicación, de navegador ou de escritorio"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "Lectura"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "Lectura e escritura"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
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:359
@@ -5327,105 +5478,104 @@ msgstr "Cancelar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "lectura e escritura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "lectura"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprobado o %1$s - permisos de \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Borrar"
+msgstr "Revogar"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
msgid "Attachments"
-msgstr ""
+msgstr "Ficheiros anexos"
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:279
msgid "Provider"
-msgstr ""
+msgstr "Provedor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Notas nas que se anexou este ficheiro"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Etiquetas para este ficheiro"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
-msgstr ""
+msgstr "Non se puido cambiar o contrasinal"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
-msgstr ""
+msgstr "Non se permite cambiar o contrasinal"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Resultados da orde"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Completouse a orde"
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "A orde fallou"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Non hai ningunha nota con esa id"
#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
-msgstr ""
+msgstr "O usuario non ten ningunha última nota"
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
+msgstr "Non se deu atopado ningún usuario co alcume %s"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr ""
+msgstr "Non se deu atopado ningún usuario local co alcume %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Esta orde aínda non está integrada."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Non ten sentido ningún facerse un aceno a un mesmo!"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
-msgstr ""
+msgstr "Fíxoselle un aceno a %s"
#: lib/command.php:260
#, php-format
@@ -5434,54 +5584,57 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Subscricións: %1$s\n"
+"Subscritores: %2$s\n"
+"Notas: %3$s"
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Marcouse a nota como favorita."
#: lib/command.php:323
msgid "You are already a member of that group"
-msgstr ""
+msgstr "Xa forma parte dese grupo"
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:339
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s"
-msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
+msgstr "Non se puido meter ao usuario %1$s no grupo %2$s"
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
+msgstr "Non se puido eliminar ao usuario %1$s do grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
-msgstr ""
+msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Localidade: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Sitio web: %s"
#. TRANS: Whois output. %s is the bio information of the queried user.
#: lib/command.php:430
#, php-format
msgid "About: %s"
-msgstr ""
+msgstr "Acerca de: %s"
#: lib/command.php:457
#, php-format
@@ -5489,117 +5642,120 @@ msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
+"%s é un perfil remoto. Só pode enviarlle mensaxes persoais aos usuarios do "
+"mesmo servidor."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
+msgstr "A mensaxe é longa de máis. O límite son %1$d caracteres, e enviou %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Envióuselle a mensaxe directa a %s"
#: lib/command.php:494
msgid "Error sending direct message."
-msgstr ""
+msgstr "Houbo un erro ao enviar a mensaxe directa."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr ""
+msgstr "Non pode repetir unha nota propia"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr ""
+msgstr "Xa repetiu esa nota"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
-msgstr ""
+msgstr "Repetiuse a nota de %s"
#: lib/command.php:531
msgid "Error repeating notice."
-msgstr ""
+msgstr "Houbo un erro ao repetir a nota."
#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "A nota é longa de máis. O límite son %d caracteres, e enviou %d"
#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
-msgstr ""
+msgstr "Enviouse a resposta a %s"
#: lib/command.php:573
msgid "Error saving notice."
-msgstr ""
+msgstr "Houbo un erro ao gardar a nota."
#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Introduza o nome do usuario ao que quere subscribirse"
#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
+msgstr "Non se pode subscribir aos perfís OMB cunha orde."
#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "Subscribiuse a %s"
#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito"
#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Cancelar a subscrición a %s"
#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
-msgstr ""
+msgstr "Aínda non se integrou esa orde."
#: lib/command.php:685
msgid "Notification off."
-msgstr ""
+msgstr "Desactivar a notificación."
#: lib/command.php:687
msgid "Can't turn off notification."
-msgstr ""
+msgstr "Non se pode desactivar a notificación."
#: lib/command.php:708
msgid "Notification on."
-msgstr ""
+msgstr "Activar a notificación."
#: lib/command.php:710
msgid "Can't turn on notification."
-msgstr ""
+msgstr "Non se pode activar a notificación."
#: lib/command.php:723
msgid "Login command is disabled"
-msgstr ""
+msgstr "A orde de identificación está desactivada"
#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"Esta ligazón só se pode utilizar unha vez, e só nos próximos dous minutos: %s"
#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
-msgstr ""
+msgstr "Cancelou a subscrición a %s"
#: lib/command.php:778
msgid "You are not subscribed to anyone."
-msgstr ""
+msgstr "Non está subscrito a ninguén."
#: lib/command.php:780
msgid "You are subscribed to this person:"
@@ -5609,7 +5765,7 @@ msgstr[1] "Vostede está subscrito a estas persoas:"
#: lib/command.php:800
msgid "No one is subscribed to you."
-msgstr ""
+msgstr "Non hai ninguén subscrito a vostede."
#: lib/command.php:802
msgid "This person is subscribed to you:"
@@ -5619,7 +5775,7 @@ msgstr[1] "Estas persoas están subscritas a vostede:"
#: lib/command.php:822
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "Non forma parte de ningún grupo."
#: lib/command.php:824
msgid "You are a member of this group:"
@@ -5668,103 +5824,143 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Ordes:\n"
+"on - activa as notificacións\n"
+"off - desactiva as notificacións\n"
+"help - amosa esta axuda\n"
+"follow <alcume> - subscribirse ao usuario\n"
+"groups - lista os grupos nos que está\n"
+"subscriptions - lista a xente á que segue\n"
+"subscribers - lista a xente que o segue\n"
+"leave <alcume> - cancela a subscrición ao usuario\n"
+"d <alcume> <texto> - mensaxe directa a un usuario\n"
+"get <alcume> - obter a última nota do usuario\n"
+"whois <alcume> - obtén a información do perfil do usuario\n"
+"lose <alcume> - facer que o usuario deixe de seguilo\n"
+"fav <alcume> - marcar como \"favorita\" a última nota do usuario\n"
+"fav #<id da nota> - marcar como \"favorita\" a nota coa id indicada\n"
+"repeat #<id da nota> - repetir a nota doa id indicada\n"
+"repeat <alcume> - repetir a última nota do usuario\n"
+"reply #<id da nota> - responder a unha nota coa id indicada\n"
+"reply <alcume> - responder á última nota do usuario\n"
+"join <grupo> - unirse ao grupo indicado\n"
+"login - obter un enderezo para identificarse na interface web\n"
+"drop <grupo> - deixar o grupo indicado\n"
+"stats - obter as súas estatísticas\n"
+"stop - idéntico a \"off\"\n"
+"quit - idéntico a \"off\"\n"
+"sub <alcume> - idéntico a \"follow\"\n"
+"unsub <alcume> - idéntico a \"leave\"\n"
+"last <alcume> - idéntico a \"get\"\n"
+"on <alcume> - aínda non se integrou\n"
+"off <alcume> - aínda non se integrou\n"
+"nudge <alcume> - facerlle un aceno ao usuario indicado\n"
+"invite <número de teléfono> - aínda non se integrou\n"
+"track <palabra> - aínda non se integrou\n"
+"untrack <palabra> - aínda non se integrou\n"
+"track off - aínda non se integrou\n"
+"untrack all - aínda non se integrou\n"
+"tracks - aínda non se integrou\n"
+"tracking - aínda non se integrou\n"
#: lib/common.php:135
msgid "No configuration file found. "
-msgstr ""
+msgstr "Non se atopou ningún ficheiro de configuración. "
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Pode que queira executar o instalador para arranxalo."
#: lib/common.php:139
msgid "Go to the installer."
-msgstr ""
+msgstr "Ir ao instalador."
#: lib/connectsettingsaction.php:110
msgid "IM"
-msgstr ""
+msgstr "MI"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Actualizacións por mensaxería instantánea (MI)"
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Actualizacións por SMS"
#: lib/connectsettingsaction.php:120
msgid "Connections"
-msgstr ""
+msgstr "Conexións"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Aplicacións conectadas autorizadas"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Houbo un erro na base de datos"
#: lib/designsettings.php:105
msgid "Upload file"
-msgstr ""
+msgstr "Cargar un ficheiro"
#: lib/designsettings.php:109
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de "
+"2MB."
#: lib/designsettings.php:418
msgid "Design defaults restored."
-msgstr ""
+msgstr "Restableceuse o deseño por defecto."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr ""
+msgstr "Desmarcar esta nota como favorita"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr ""
+msgstr "Marcar esta nota como favorita"
#: lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "Marcar como favorito"
#: 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 "Amigo dun amigo"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Exportar os datos"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr ""
+msgstr "Filtrar as etiquetas"
#: lib/galleryaction.php:131
msgid "All"
-msgstr ""
+msgstr "Todas"
#: lib/galleryaction.php:139
msgid "Select tag to filter"
-msgstr ""
+msgstr "Escolla unha etiqueta a filtrar"
#: lib/galleryaction.php:140
msgid "Tag"
@@ -5772,157 +5968,161 @@ msgstr "Etiqueta"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Escolla unha etiqueta para reducir a lista"
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "Continuar"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Outorgarlle a este usuario o rol \"%s\""
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr ""
+msgstr "Describa o grupo ou o tema"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "Describa o grupo ou o tema en %d caracteres"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
msgstr ""
+"Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
+"Comunidade, País\""
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
+"máximo"
#: lib/groupnav.php:85
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: lib/groupnav.php:101
msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
-msgstr ""
+msgstr "%s usuarios bloqueados"
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Modificar as propiedades do grupo %s"
#: lib/groupnav.php:113
msgid "Logo"
-msgstr ""
+msgstr "Logotipo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Engadir ou modificar o logotipo de %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Engadir ou modificar o deseño de %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr ""
+msgstr "Grupos con máis membros"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr ""
+msgstr "Grupos con máis notas"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Etiquetas nas notas do grupo %s"
#. TRANS: Client exception 406
#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "Esta páxina non está dispoñible nun formato axeitado para vostede"
#: lib/imagefile.php:72
msgid "Unsupported image file format."
-msgstr ""
+msgstr "Non se soporta o formato da imaxe."
#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Ese ficheiro é grande de máis. O tamaño máximo por ficheiro son %s."
#: lib/imagefile.php:93
msgid "Partial upload."
-msgstr ""
+msgstr "Carga parcial."
#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr ""
+msgstr "Houbo un erro no sistema ao cargar o ficheiro."
#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "O ficheiro está mal ou non é unha imaxe."
#: lib/imagefile.php:122
msgid "Lost our file."
-msgstr ""
+msgstr "Perdeuse o noso ficheiro."
#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
-msgstr ""
+msgstr "Non se coñece o tipo de ficheiro"
#: lib/imagefile.php:244
msgid "MB"
-msgstr ""
+msgstr "MB"
#: lib/imagefile.php:246
msgid "kB"
-msgstr ""
+msgstr "kB"
#: lib/jabber.php:387
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
-msgstr ""
+msgstr "Non se coñece a fonte %d da caixa de entrada."
#: lib/joinform.php:114
msgid "Join"
-msgstr ""
+msgstr "Unirse"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr ""
+msgstr "Deixar"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
-msgstr ""
+msgstr "Identificarse cun nome de usuario e contrasinal"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr ""
+msgstr "Rexistrar unha conta nova"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
msgid "Email address confirmation"
-msgstr ""
+msgstr "Confirmación do enderezo de correo electrónico"
#. TRANS: Body for address confirmation email.
#: lib/mail.php:177
@@ -5941,15 +6141,36 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Ola, %s:\n"
+"\n"
+"Alguén acaba de introducir este enderezo de correo electrónico en %s.\n"
+"\n"
+"Se foi vostede, e quere confirmalo, utilice o seguinte URL:\n"
+"\n"
+"%s\n"
+"\n"
+"En caso contrario, simplemente ignore esta mensaxe.\n"
+"\n"
+"Grazas polo seu tempo, \n"
+"%s\n"
#. TRANS: Subject of new-subscriber notification e-mail
#: lib/mail.php:243
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
+msgstr "Agora %1$s segue as súas notas en %2$s."
+
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
msgstr ""
+"Se cre que esta conta se está usando con fins abusivos, pode bloquear a súa "
+"lista de subscritores e informar disto aos administradores do sitio en %s"
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5963,21 +6184,32 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"Agora %1$s segue as súas notas en %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Atentamente,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Modifique o seu enderezo de correo electrónico ou as súas preferencias de "
+"notificación en %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
-msgstr ""
+msgstr "Biografía: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Novo enderezo de correo electrónico para publicar en %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5989,32 +6221,41 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
+"Ten un novo enderezo de correo electrónico para publicar en %1$s.\n"
+"\n"
+"Envíe un correo electrónico a %2$s para publicar mensaxes novas.\n"
+"\n"
+"Máis información en %3$s.\n"
+"\n"
+"Atentamente,\n"
+"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
-msgstr ""
+msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
-msgstr ""
+msgstr "Confirmación dos SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
+"%s: utilice o seguinte código para confirmar que o número de teléfono é seu:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
-msgstr ""
+msgstr "%s fíxolle un aceno"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6029,15 +6270,26 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) pregúntase que estivo a facer vostede estes días, e convídao a "
+"publicar algunha nova.\n"
+"\n"
+"Así que anímese, conte algo :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Non responda a esta mensaxe, non lle chegará ao remitente.\n"
+"\n"
+"Atentamente,\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
-msgstr ""
+msgstr "Nova mensaxe privada de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6055,15 +6307,29 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) envioulle unha mensaxe privada:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Pode responder á mensaxe aquí:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Non responda a esta mensaxe, non lle chegará ao remitente.\n"
+"\n"
+"Atentamente,\n"
+"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
+msgstr "%s (@%s) marcou a súa nota como favorita"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6083,23 +6349,43 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) acaba de marcar a súa nota en %2$s coma unha das súas "
+"favoritas.\n"
+"\n"
+"O URL da súa nota é:\n"
+"\n"
+"%3$s\n"
+"\n"
+"O texto da nota di:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Pode ver a lista das notas favoritas de %1$s en:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Atentamente,\n"
+"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"Pode ler a conversa completa en:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) enviou unha nota á súa atención"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6125,210 +6411,240 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) acaba de enviar unha nota á súa atención (unha resposta) en %2"
+"$s.\n"
+"\n"
+"A nota está en:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Di:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sPode responder en:\n"
+"\n"
+"%6$s\n"
+"\n"
+"A lista de todas as respostas está en:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Atentamente,\n"
+"%2$s\n"
+"\n"
+"P.S.: pode desactivar estas notificacións por correo electrónico en %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Só o usuario pode ler as súas caixas de entrada."
#: lib/mailbox.php:139
msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con "
+"outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
-msgstr ""
+msgstr "de"
#: lib/mailhandler.php:37
msgid "Could not parse message."
-msgstr ""
+msgstr "Non se puido analizar a mensaxe."
#: lib/mailhandler.php:42
msgid "Not a registered user."
-msgstr ""
+msgstr "Non está rexistrado."
#: lib/mailhandler.php:46
msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Ese non é o seu enderezo de correo electrónico para recibir correos."
#: lib/mailhandler.php:50
msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Non se permite recibir correo electrónico."
#: lib/mailhandler.php:228
#, php-format
msgid "Unsupported message type: %s"
-msgstr ""
+msgstr "Non se soporta o tipo de mensaxe: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Houbo un erro na base de datos ao gardar o seu ficheiro. Volva intentalo."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no "
+"formulario HTML."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "O ficheiro só se subiu parcialmente."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Falta un cartafol temporal."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Non se puido escribir o ficheiro no disco."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Interrompeuse a carga do ficheiro por mor da extensión."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "O ficheiro supera a cota do usuario."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Non se puido mover o ficheiro ao directorio de destino."
#: lib/mediafile.php:201 lib/mediafile.php:237
msgid "Could not determine file's MIME type."
-msgstr ""
+msgstr "Non se puido determinar o tipo MIME do ficheiro."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr "Inténteo utilizando outro formato %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "Neste servidor non se soporta o tipo de ficheiro %s."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "Enviar unha nota directa"
#: lib/messageform.php:146
msgid "To"
-msgstr ""
+msgstr "A"
#: lib/messageform.php:159 lib/noticeform.php:185
msgid "Available characters"
-msgstr ""
+msgstr "Caracteres dispoñibles"
#: lib/messageform.php:178 lib/noticeform.php:236
msgctxt "Send button for sending notice"
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr ""
+msgstr "Enviar unha nota"
#: lib/noticeform.php:173
#, php-format
msgid "What's up, %s?"
-msgstr ""
+msgstr "Que hai de novo, %s?"
#: lib/noticeform.php:192
msgid "Attach"
-msgstr ""
+msgstr "Anexar"
#: lib/noticeform.php:196
msgid "Attach a file"
-msgstr ""
+msgstr "Anexar un ficheiro"
#: lib/noticeform.php:212
msgid "Share my location"
-msgstr ""
+msgstr "Publicar a miña localidade"
#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr ""
+msgstr "Non publicar a miña localidade"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Estase tardando máis do esperado en obter a súa xeolocalización, vólvao "
+"intentar máis tarde"
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
msgid "N"
-msgstr ""
+msgstr "N"
#. TRANS: Used in coordinates as abbreviation of south
#: lib/noticelist.php:432
msgid "S"
-msgstr ""
+msgstr "S"
#. TRANS: Used in coordinates as abbreviation of east
#: lib/noticelist.php:434
msgid "E"
-msgstr ""
+msgstr "L"
#. TRANS: Used in coordinates as abbreviation of west
#: lib/noticelist.php:436
msgid "W"
-msgstr ""
+msgstr "O"
#: lib/noticelist.php:438
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
#: lib/noticelist.php:447
msgid "at"
-msgstr ""
+msgstr "en"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
-msgstr ""
+msgstr "no contexto"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
-msgstr ""
+msgstr "Repetida por"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
-msgstr ""
+msgstr "Responder a esta nota"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
-msgstr ""
+msgstr "Responder"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
-msgstr ""
+msgstr "Repetiuse a nota"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr ""
+msgstr "Facerlle un aceno a este usuario"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "Facer un aceno"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Facerlle un aceno a este usuario"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
-msgstr ""
+msgstr "Houbo un erro ao inserir o novo perfil"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "Houbo un erro ao inserir o avatar"
#: lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -6336,117 +6652,117 @@ msgstr "Houbo un erro ao actualizar o perfil remoto"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
-msgstr ""
+msgstr "Houbo un erro ao inserir o perfil remoto"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr ""
+msgstr "Nota duplicada"
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Non se puido inserir unha subscrición nova."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr ""
+msgstr "Persoal"
#: lib/personalgroupnav.php:104
msgid "Replies"
-msgstr ""
+msgstr "Respostas"
#: lib/personalgroupnav.php:114
msgid "Favorites"
-msgstr ""
+msgstr "Favoritas"
#: lib/personalgroupnav.php:125
msgid "Inbox"
-msgstr ""
+msgstr "Caixa de entrada"
#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
-msgstr ""
+msgstr "As mensaxes recibidas"
#: lib/personalgroupnav.php:130
msgid "Outbox"
-msgstr ""
+msgstr "Caixa de saída"
#: lib/personalgroupnav.php:131
msgid "Your sent messages"
-msgstr ""
+msgstr "As mensaxes enviadas"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Etiquetas nas notas de %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
-msgstr ""
+msgstr "Descoñecida"
#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
-msgstr ""
+msgstr "Subscricións"
#: lib/profileaction.php:126
msgid "All subscriptions"
-msgstr ""
+msgstr "Todas as subscricións"
#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
-msgstr ""
+msgstr "Subscritores"
#: lib/profileaction.php:161
msgid "All subscribers"
-msgstr ""
+msgstr "Todos os subscritores"
#: lib/profileaction.php:191
msgid "User ID"
-msgstr ""
+msgstr "ID do usuario"
#: lib/profileaction.php:196
msgid "Member since"
-msgstr ""
+msgstr "Membro dende"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Media diaria"
#: lib/profileaction.php:264
msgid "All groups"
-msgstr ""
+msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
-msgstr ""
+msgstr "Aínda non se implantou o método."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr ""
+msgstr "Públicas"
#: lib/publicgroupnav.php:82
msgid "User groups"
-msgstr ""
+msgstr "Grupos do usuario"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr ""
+msgstr "Últimas etiquetas"
#: lib/publicgroupnav.php:88
msgid "Featured"
-msgstr ""
+msgstr "Salientadas"
#: lib/publicgroupnav.php:92
msgid "Popular"
-msgstr ""
+msgstr "Populares"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
-msgstr ""
+msgstr "Sen argumentos \"return-to\"."
#: lib/repeatform.php:107
msgid "Repeat this notice?"
-msgstr ""
+msgstr "Quere repetir esta nota?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6454,255 +6770,304 @@ msgstr "Si"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr ""
+msgstr "Repetir esta nota"
#: lib/revokeroleform.php:91
#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr ""
+msgstr "Revogarlle o rol \"%s\" a este usuario"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
#: lib/sandboxform.php:67
msgid "Sandbox"
-msgstr ""
+msgstr "Illar"
#: lib/sandboxform.php:78
msgid "Sandbox this user"
-msgstr ""
+msgstr "Illar a este usuario"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr ""
+msgstr "Buscar no sitio"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Termos de busca"
#: lib/searchaction.php:127
msgid "Search"
-msgstr ""
+msgstr "Buscar"
#: lib/searchaction.php:162
msgid "Search help"
-msgstr ""
+msgstr "Buscar na axuda"
#: lib/searchgroupnav.php:80
msgid "People"
-msgstr ""
+msgstr "Xente"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr ""
+msgstr "Atopar xente neste sitio"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr ""
+msgstr "Buscar nos contidos das notas"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "Buscar grupos neste sitio"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Sección sen título"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Máis..."
#: lib/silenceform.php:67
msgid "Silence"
-msgstr ""
+msgstr "Silenciar"
#: lib/silenceform.php:78
msgid "Silence this user"
-msgstr ""
+msgstr "Silenciar a este usuario"
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr ""
+msgstr "Persoas ás que está subscrito %s"
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr ""
+msgstr "Persoas subscritas a %s"
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Grupos aos que pertence %s"
#: lib/subgroupnav.php:105
msgid "Invite"
-msgstr ""
+msgstr "Convidar"
#: lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Convide a amigos e compañeiros a unírselle en %s"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Nube de etiquetas que as persoas se puxeron a si mesmas"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Nube de etiquetas que lle puxo a outras persoas"
#: lib/tagcloudsection.php:56
msgid "None"
+msgstr "Ningún"
+
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"O servidor non pode xestionar as cargas de temas visuais sen soporte para o "
+"formato ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Houbo un erro no sistema ao cargar o tema visual."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Non se puido gardar o tema visual."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Tema visual inválido: a estrutura do directorio é incorrecta"
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
msgstr ""
+"O tema visual cargado é grande de máis; o tamaño descomprimido non pode "
+"superar os %d bytes."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Arquivo de tema visual inválido: falta o ficheiro css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"O tema visual contén un ficheiro inválido ou nome de cartafol incorrecto. "
+"Limíteo a letras ASCII, díxitos, barras baixas e signos menos."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "O tema visual contén o tipo de ficheiro \".%s\". Non está permitido."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Houbo un erro ao abrir o arquivo do tema visual."
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr ""
+msgstr "Os que máis publican"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Deixar de illar"
#: lib/unsandboxform.php:80
msgid "Unsandbox this user"
-msgstr ""
+msgstr "Deixar de illar a este usuario"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Dar voz"
#: lib/unsilenceform.php:78
msgid "Unsilence this user"
-msgstr ""
+msgstr "Darlle voz a este usuario"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Cancelar a subscrición a este usuario"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr ""
+msgstr "Cancelar a subscrición"
#: lib/usernoprofileexception.php:58
#, php-format
msgid "User %s (%d) has no profile record."
-msgstr ""
+msgstr "O usuario %s (%d) non ten perfil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
-msgstr ""
+msgstr "Modificar o avatar"
#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
-msgstr ""
+msgstr "Accións do usuario"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "Procedendo a borrar o usuario..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
-msgstr ""
+msgstr "Modificar a configuración do perfil"
#: lib/userprofile.php:264
msgid "Edit"
-msgstr ""
+msgstr "Modificar"
#: lib/userprofile.php:287
msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Enviarlle unha mensaxe directa a este usuario"
#: lib/userprofile.php:288
msgid "Message"
-msgstr ""
+msgstr "Mensaxe"
#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "Moderar"
#: lib/userprofile.php:364
msgid "User role"
-msgstr ""
+msgstr "Rol do usuario"
#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr ""
+msgstr "Administrador"
#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
-msgstr ""
+msgstr "hai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
-msgstr ""
+msgstr "hai como un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
-msgstr ""
+msgstr "hai como %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
-msgstr ""
+msgstr "hai como unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
-msgstr ""
+msgstr "hai como %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
-msgstr ""
+msgstr "hai como un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
-msgstr ""
+msgstr "hai como %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
-msgstr ""
+msgstr "hai como un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
-msgstr ""
+msgstr "hai como %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
-msgstr ""
+msgstr "hai como un ano"
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr ""
+msgstr "%s non é unha cor correcta!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 05d408781..d1b13a29a 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:56+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:54+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -20,7 +20,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "קבל"
@@ -89,25 +89,25 @@ msgid "Save"
msgstr "שמור"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "×ין הודעה כזו."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -120,7 +120,7 @@ msgid "No such user."
msgstr "×ין משתמש ×›×–×”."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s וחברי×"
@@ -128,39 +128,39 @@ msgstr "%s וחברי×"
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s וחברי×"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "הזנות ×”×—×‘×¨×™× ×©×œ %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "הזנות ×”×—×‘×¨×™× ×©×œ %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "הזנות ×”×—×‘×¨×™× ×©×œ %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -168,14 +168,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -183,66 +183,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s וחברי×"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "קוד ×”×ישור ×œ× × ×ž×¦×."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "עידכון המשתמש נכשל."
@@ -264,7 +264,7 @@ msgstr "שמירת הפרופיל נכשלה."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -323,42 +323,42 @@ msgstr ""
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr ""
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "זהו כבר זיהוי ה-Jabber שלך."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
@@ -395,122 +395,122 @@ msgstr "עידכון המשתמש נכשל."
msgid "Could not find target user."
msgstr "עידכון המשתמש נכשל."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "כינוי יכול להכיל רק ×ותיות ×נגליות קטנות ומספרי×, ×•×œ×œ× ×¨×•×•×—×™×."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "כינוי ×–×” כבר תפוס. נסה כינוי ×חר."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "×©× ×ž×©×ª×ž×© ×œ× ×—×•×§×™."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "×”×©× ×”×ž×œ× ×רוך מידי (מותרות 255 ×ותיות בלבד)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיות)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "×©× ×”×ž×™×§×•× ×רוך מידי (מותר עד 255 ×ותיות)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "כתובת ×תר הבית '%s' ××™× ×” חוקית"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "כינוי ×–×” כבר תפוס. נסה כינוי ×חר."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "×œ× × ×ž×¦×"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "כבר נכנסת למערכת!"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "נכשלה ההפניה לשרת: %s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "נכשלה יצירת OpenID מתוך: %s"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "פרופיל"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr ""
@@ -526,15 +526,15 @@ msgstr "גודל ×œ× ×—×•×§×™."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -598,13 +598,13 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
#, fuzzy
msgid "Account"
msgstr "×ודות"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -612,8 +612,8 @@ msgid "Nickname"
msgstr "כינוי"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "סיסמה"
@@ -629,11 +629,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -652,27 +652,27 @@ msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון"
msgid "Already repeated that notice."
msgstr "כבר נכנסת למערכת!"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "התמונה עודכנה."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "×œ× × ×ž×¦×"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -682,32 +682,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "פורמט התמונה ×ינו נתמך."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "מיקרובלוג מ×ת %s"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -722,12 +722,12 @@ msgstr "תגובת עבור %s"
msgid "Repeats of %s"
msgstr "תגובת עבור %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "מיקרובלוג מ×ת %s"
@@ -787,7 +787,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "מחק"
@@ -831,12 +831,12 @@ msgstr "התמונה עודכנה."
msgid "You already blocked that user."
msgstr "כבר נכנסת למערכת!"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "×ין משתמש ×›×–×”."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -848,7 +848,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -858,7 +858,7 @@ msgstr "ל×"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "×ין משתמש ×›×–×”."
@@ -868,7 +868,7 @@ msgstr "×ין משתמש ×›×–×”."
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -877,12 +877,12 @@ msgid "Yes"
msgstr "כן"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "×ין משתמש ×›×–×”."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1017,7 +1017,7 @@ msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1051,7 +1051,7 @@ msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ות
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "×œ× ×ž×—×•×‘×¨."
@@ -1081,7 +1081,7 @@ msgid "Do not delete this notice"
msgstr "×ין הודעה כזו."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1123,50 +1123,59 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "גודל ×œ× ×—×•×§×™."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "עמוד ×–×” ×ינו זמין בסוג מדיה ש×תה יכול לקבל"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "שנה סיסמה"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "הודעה חדשה"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "שנה"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "הודעה חדשה"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "הודעה חדשה"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1174,61 +1183,69 @@ msgid ""
msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "שנה סיסמה"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "התחבר"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "חיפוש"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "טקסט"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "היכנס"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1238,7 +1255,7 @@ msgstr ""
msgid "Save"
msgstr "שמור"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1526,7 +1543,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1763,13 +1780,13 @@ msgstr "למשתמש ×ין פרופיל."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1914,7 +1931,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr ""
@@ -2311,50 +2328,54 @@ msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
msgid "%1$s left group %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "כבר מחובר."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "×©× ×ž×©×ª×ž×© ×ו סיסמה ×œ× × ×›×•× ×™×."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "×œ× ×ž×•×¨×©×”."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "זכור ×ותי"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "בעתיד התחבר ×וטומטית; ×œ× ×œ×©×™×ž×•×© ×‘×ž×—×©×‘×™× ×¦×™×‘×•×¨×™×™×!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "שכחת ×ו ×יבדת ×ת הסיסמה?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "לצרכי ×בטחה, הכנס מחדש ×ת ×©× ×”×ž×©×ª×ž×© והסיסמה לפני שתשנה ×ת ההגדרות."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "×©× ×”×ž×©×ª×ž×© ×ו הסיסמה ×œ× ×—×•×§×™×™×"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"היכנס בעזרת ×©× ×”×ž×©×ª×ž×© והסיסמה שלך. עדיין ×ין לך ×©× ×ž×©×ª×ž×©? [הרש×](%%action."
"register%%) לחשבון "
@@ -2556,31 +2577,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "להודעה ×ין פרופיל"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "התחבר"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2692,7 +2713,7 @@ msgid "6 or more characters"
msgstr "לפחות 6 ×ותיות"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "×שר"
@@ -2704,11 +2725,11 @@ msgstr "זהה לסיסמה למעלה"
msgid "Change"
msgstr "שנה"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "הסיסמ×ות ×œ× ×ª×•×מות."
@@ -2729,7 +2750,7 @@ msgid "Password saved."
msgstr "הסיסמה נשמרה."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2943,44 +2964,44 @@ msgstr "פרופיל ×œ× ×ž×•×›×¨"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 עד 64 ×ותיות ×נגליות קטנות ×ו מספרי×, ×œ×œ× ×¡×™×ž× ×™ פיסוק ×ו רווחי×."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "×©× ×ž×œ×"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "×תר בית"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "הכתובת של ×תר הבית שלך, בלוג, ×ו פרופיל ב×תר ×חר "
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ביוגרפיה"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "מיקו×"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "מיקומך, למשל \"עיר, מדינה ×ו מחוז, ×רץ\""
@@ -3020,7 +3041,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיות)"
@@ -3270,7 +3291,7 @@ msgstr "הסיסמה חייבת להיות בת לפחות 6 ×ותיות."
msgid "Password and confirmation do not match."
msgstr "הסיסמה ו×ישורה ×ינן תו×מות."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "שגי××” ביצירת ×©× ×”×ž×©×ª×ž×©."
@@ -3278,79 +3299,101 @@ msgstr "שגי××” ביצירת ×©× ×”×ž×©×ª×ž×©."
msgid "New password successfully saved. You are now logged in."
msgstr "הסיסמה החדשה נשמרה בהצלחה. ×תה מחובר למערכת."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "שגי××” ב×ישור הקוד."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "הירש×"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון"
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr ""
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "×©× ×”×ž×©×ª×ž×© ×ו הסיסמה ×œ× ×—×•×§×™×™×"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr " לפחות 6 ×ותיות. שדה חובה."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr ""
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "לשימוש רק ×‘×ž×§×¨×™× ×©×œ עידכוני×, הודעות מערכת, ושיחזורי סיסמ×ות"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3369,7 +3412,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3453,7 +3496,7 @@ msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון"
msgid "You already repeated that notice."
msgstr "כבר נכנסת למערכת!"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "צור"
@@ -3525,7 +3568,7 @@ msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
msgid "User doesn't have this role."
msgstr "למשתמש ×ין פרופיל."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "התמונה עודכנה."
@@ -3542,7 +3585,7 @@ msgstr "למשתמש ×ין פרופיל."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3587,7 +3630,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3600,7 +3643,7 @@ msgid "Organization"
msgstr "מיקו×"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
@@ -4201,7 +4244,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4560,7 +4603,7 @@ msgstr ""
"בדוק ×ת ×”×¤×¨×˜×™× ×›×“×™ ×œ×•×•×“× ×©×‘×¨×¦×•× ×š ×œ×”×™×¨×©× ×›×ž× ×•×™ להודעות משתמש ×–×”. ×× ×ינך רוצה "
"להירש×, לחץ \"בטל\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4690,29 +4733,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "סטטיסטיקה"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4720,7 +4763,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4728,40 +4771,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "×ישי"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4804,48 +4847,48 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4956,128 +4999,128 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "×ישי"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "שנה סיסמה"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "התחבר"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "הרשמות"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "גודל ×œ× ×—×•×§×™."
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "צ×"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "צור חשבון חדש"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "הירש×"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "היכנס"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "עזרה"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5085,74 +5128,74 @@ msgstr "חיפוש"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "עזרה"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "×ודות"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "רשימת ש×לות נפוצות"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "פרטיות"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "מקור"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5162,13 +5205,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ×”×•× ×©×¨×•×ª ביקרובלוג."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5180,57 +5223,57 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
#, fuzzy
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:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "לפני >>"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5238,11 +5281,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5273,73 +5316,73 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "הרשמות"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "הודעה חדשה"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "×ישי"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "הרשמות"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "מתשמש"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "הרשמות"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "הרשמות"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "הרשמות"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "הודעה חדשה"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "הרשמות"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5475,12 +5518,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "הסיסמה נשמרה."
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "הסיסמה נשמרה."
@@ -5575,14 +5618,14 @@ msgstr "×©× ×ž×œ×"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6081,8 +6124,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s כעת מ×זין להודעות שלך ב-%2$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6103,19 +6153,19 @@ msgstr ""
" %4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "×ודות: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6129,30 +6179,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6169,13 +6219,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6195,13 +6245,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s כעת מ×זין להודעות שלך ב-%2$s"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6223,7 +6273,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6231,13 +6281,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6274,7 +6324,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr ""
@@ -6435,26 +6485,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "×ין תוכן!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "צור"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "הגב"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "הודעות"
@@ -6529,7 +6579,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6568,7 +6618,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6593,7 +6643,7 @@ msgstr ""
msgid "Popular"
msgstr "×נשי×"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "×ין מסמך ×›×–×”."
@@ -6617,7 +6667,7 @@ msgstr "×ין הודעה כזו."
msgid "Revoke the \"%s\" role from this user"
msgstr "×ין משתמש ×›×–×”."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6721,6 +6771,51 @@ msgstr ""
msgid "None"
msgstr "ל×"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "שגי×ת מערכת בהעל×ת הקובץ."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "עדכון התמונה נכשל."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "שגי××” בעדכון פרופיל מרוחק"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6807,56 +6902,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "לפני כדקה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "לפני כשעה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "לפני כיו×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "לפני ×›-%d ימי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "לפני כחודש"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "לפני ×›-%d חודשי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index dc063eec9..1c5781d51 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:59+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:03:58+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Přistup"
@@ -40,7 +40,7 @@ msgstr "Registrowanje"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "Anonymnym wužiwarjam (njepřizjewjenym) wobhladowanje sydła zakazć?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
@@ -85,25 +85,24 @@ msgid "Save"
msgstr "Składować"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Strona njeeksistuje"
+msgstr "Strona njeeksistuje."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -116,7 +115,7 @@ msgid "No such user."
msgstr "Wužiwar njeeksistuje"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s a přećeljo, strona %2$d"
@@ -124,39 +123,39 @@ msgstr "%1$s a přećeljo, strona %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s a přećeljo"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Kanal za přećelow wužiwarja %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Kanal za přećelow wužiwarja %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -164,14 +163,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,64 +178,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Ty a přećeljo"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Aktualizacije wot %1$s a přećelow na %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metoda njenamakana."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Tuta metoda wužaduje sej POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Wužiwar njeje so dał aktualizować."
@@ -256,7 +255,7 @@ msgstr "Profil njeje so składować dał."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -287,11 +286,11 @@ msgstr "Njemóžeš so samoho blokować."
#: actions/apiblockcreate.php:126
msgid "Block user failed."
-msgstr ""
+msgstr "Blokowanje wužiwarja je so njeporadźiło."
#: actions/apiblockdestroy.php:114
msgid "Unblock user failed."
-msgstr ""
+msgstr "Wotblokowanje wužiwarja je so njeporadźiło."
#: actions/apidirectmessage.php:89
#, php-format
@@ -313,43 +312,45 @@ msgstr "Direktne powěsće do %s"
msgid "All the direct messages sent to %s"
msgstr "Wšě do %s pósłane direktne powěsće"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Žadyn powěsćowy tekst!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Přijimowar njenamakany."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
+"Njeje móžno, direktne powěsće wužiwarjam pósłać, kotřiž twoji přećeljo "
+"njejsu."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Status z tym ID njenamakany."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Tutón status je hižo faworit."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
-msgstr ""
+msgstr "Faworit njeda so wutworić."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Tón status faworit njeje."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
-msgstr ""
+msgstr "Faworit njeda so zhašeć."
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
@@ -370,130 +371,129 @@ msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Dwaj wužiwarskej ID abo wužiwarskej mjenje dyrbitej so podać."
#: actions/apifriendshipsshow.php:134
msgid "Could not determine source user."
-msgstr ""
+msgstr "Žórłowy wužiwar njeda so postajić."
#: actions/apifriendshipsshow.php:142
msgid "Could not find target user."
-msgstr ""
+msgstr "Cilowy wužiwar njeda so namakać."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Žane płaćiwe přimjeno."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Startowa strona njeje płaćiwy URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Wopisanje je předołho (maks. %d znamješkow)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Městno je předołho (maks. 255 znamješkow)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Přewjele aliasow! Maksimum: %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Njepłaćiwy alias: \"%s\""
+msgstr "Njepłaćiwy alias: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias njemóže samsny kaž přimjeno być."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "Skupina njenamakana!"
+msgstr "Skupina njenamakana."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Sy hižo ÄÅ‚on teje skupiny."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Administratora tuteje skupiny je će zablokował."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Njejsy ÄÅ‚on tuteje skupiny."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
-msgstr ""
+msgstr "Skupiny wužiwarja %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr ""
+msgstr "Skupiny na %1$s, w kotrychž wužiwar %2$s je ÄÅ‚on."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s skupinow"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "skupiny na %s"
@@ -508,15 +508,15 @@ msgstr "Njepłaćiwy token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -558,15 +558,15 @@ msgstr ""
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
-msgstr ""
+msgstr "NjewoÄakowane wotpósÅ‚anje formulara."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Aplikacija chce so z twojom kontom zwjazać"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "Přistup dowolić abo wotpokazać"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -577,12 +577,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -590,8 +590,8 @@ msgid "Nickname"
msgstr "Přimjeno"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Hesło"
@@ -605,13 +605,13 @@ msgstr "Dowolić"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "Přistup ke kontowym informacijam dowolić abo wotpokazać."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Tuta metoda wužaduje sej POST abo DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "NjemóžeÅ¡ status druheho wužiwarja zniÄić."
@@ -628,25 +628,25 @@ msgstr "Njemóžno twoju zdźělenku wospjetować."
msgid "Already repeated that notice."
msgstr "Tuta zdźělenka bu hižo wospjetowana."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Status zniÄeny."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Žadyn status z tym ID namakany."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Njenamakany."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -655,35 +655,35 @@ msgstr ""
msgid "Unsupported format."
msgstr "Njepodpěrany format."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr ""
+msgstr "%s aktualizacijow wote wšěch!"
#: actions/apitimelineretweetedtome.php:111
#, php-format
@@ -695,12 +695,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -758,7 +758,7 @@ msgid "Preview"
msgstr "Přehlad"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "ZniÄić"
@@ -780,7 +780,7 @@ msgstr ""
#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
-msgstr ""
+msgstr "Naše datajowe daty su so zhubili."
#: actions/avatarsettings.php:370
msgid "Avatar updated."
@@ -788,7 +788,7 @@ msgstr "Awatar zaktualizowany."
#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
-msgstr ""
+msgstr "Aktualizowanje awatara je so njeporadźiło."
#: actions/avatarsettings.php:397
msgid "Avatar deleted."
@@ -798,11 +798,11 @@ msgstr "Awatar zniÄeny."
msgid "You already blocked that user."
msgstr "Sy tutoho wužiwarja hižo zablokował."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Wužiwarja blokować"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -814,17 +814,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "NÄ›"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Tutoho wužiwarja njeblokować"
@@ -833,20 +832,19 @@ msgstr "Tutoho wužiwarja njeblokować"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Haj"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -867,7 +865,7 @@ msgstr "Skupina njeeksistuje."
#: actions/blockedfromgroup.php:97
#, php-format
msgid "%s blocked profiles"
-msgstr ""
+msgstr "%s je profile zablokował"
#: actions/blockedfromgroup.php:100
#, php-format
@@ -880,21 +878,21 @@ msgstr ""
#: actions/blockedfromgroup.php:288
msgid "Unblock user from group"
-msgstr ""
+msgstr "Wužiwarja za skupinu wotblokować"
#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
msgid "Unblock"
-msgstr ""
+msgstr "Wotblokować"
#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
msgid "Unblock this user"
-msgstr ""
+msgstr "Tutoho wužiwarja wotblokować"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "skupiny na %s"
+msgstr "Na %s pósłać"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -910,9 +908,9 @@ msgstr "Tutón wobkrućenski kod njeje za tebje!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Njespóznany adresowy typ %s"
+msgstr "Njespóznaty adresowy typ %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -931,14 +929,14 @@ msgstr "Tuta adresa bu hižo wobkrućena."
#: actions/profilesettings.php:283 actions/smssettings.php:308
#: actions/smssettings.php:464
msgid "Couldn't update user."
-msgstr ""
+msgstr "Wužiwar njeda aktualizować."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
#: actions/confirmaddress.php:128 actions/emailsettings.php:433
#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
-msgstr ""
+msgstr "E-mejlowe wobkrućenje njeda so zhašeć."
#: actions/confirmaddress.php:146
msgid "Confirm address"
@@ -973,7 +971,7 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1004,7 +1002,7 @@ msgstr "Tutu aplikaciju zniÄić"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Njepřizjewjeny."
@@ -1033,7 +1031,7 @@ msgid "Do not delete this notice"
msgstr "Tutu zdźělenku njewušmórnyć"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Tutu zdźělenku wušmórnyć"
@@ -1071,45 +1069,53 @@ msgstr "Design"
msgid "Design settings for this StatusNet site."
msgstr "Designowe nastajenja za tute sydło StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Njepłaćiwy logowy URL."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "Å at njesteji k dispoziciji: %s"
+msgstr "Å at njesteji k dispoziciji: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Logo změnić"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo sydła"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Šat změnić"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Šat sydła"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Šat za sydło."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Swójski šat"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Pozadkowy wobraz změnić"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Pozadk"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1118,57 +1124,65 @@ 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:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Zapinjeny"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Wupinjeny"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Barby změnić"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Wobsah"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "BóÄnica"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Wotkazy"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Rozšěrjeny"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Swójski CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standardne hódnoty wužiwać"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standardne designy wobnowić"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Na standard wróćo stajić"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1178,7 +1192,7 @@ msgstr "Na standard wróćo stajić"
msgid "Save"
msgstr "Składować"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Design składować"
@@ -1230,7 +1244,7 @@ msgstr "Wopisanje je trěbne."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "Žórłowy URL je předołhi."
#: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Source URL is not valid."
@@ -1238,7 +1252,7 @@ msgstr "URL žórła płaćiwy njeje."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "Organizacija je trěbna."
#: actions/editapplication.php:206 actions/newapplication.php:191
msgid "Organization is too long (max 255 chars)."
@@ -1246,7 +1260,7 @@ msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "Startowa strona organizacije je trěbna."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
@@ -1263,7 +1277,7 @@ msgstr "Aplikacija njeda so aktualizować."
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
-msgstr ""
+msgstr "Skupinu %s wobdźěłać"
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
@@ -1331,7 +1345,6 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Wotstronić"
@@ -1348,7 +1361,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Přetorhnyć"
@@ -1363,7 +1375,6 @@ msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Přidać"
@@ -1389,16 +1400,14 @@ msgstr ""
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nowy"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Nastajenja"
+msgstr "E-mejlowe nastajenja"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1413,7 +1422,7 @@ msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "E-mejl pósłać, hdyž něchtó priwatnu powěsć sćele."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:199
@@ -1437,9 +1446,8 @@ msgstr "MicroID za moju e-mejlowu adresu publikować"
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Designowe nastajenja składowane."
+msgstr "E-mejlowe nastajenja składowane."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1452,7 +1460,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -1492,15 +1500,13 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "to je wopaÄna IM-adresa."
+msgstr "To je wopaÄna e-mejlowa adresa."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Wobkrućenje přetorhnjene."
+msgstr "E-mejlowe wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1510,9 +1516,8 @@ msgstr "To njeje twoja e-mejlowa adresa."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Adresa bu wotstronjena."
+msgstr "E-mejlowa adresa bu wotstronjena."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1523,7 +1528,7 @@ msgstr "Žana adresa za dochadźace e-mejle."
#: actions/emailsettings.php:504 actions/emailsettings.php:528
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
-msgstr ""
+msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:508 actions/smssettings.php:581
@@ -1588,17 +1593,17 @@ msgstr ""
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
msgid "Featured users"
-msgstr ""
+msgstr "Nazhonići wužiwarjo"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "Nazhonići wužiwarjo, strona %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "Wuběr wulkotnych wužiwarjow na %s"
#: actions/file.php:34
msgid "No notice ID."
@@ -1626,11 +1631,11 @@ msgstr ""
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr ""
+msgstr "Móžeš lokalny abonement wužiwać!"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Tutón wužiwar ći abonowanje njedowoli."
#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
@@ -1645,9 +1650,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Zmylk při zasunjenju zdaleneho profila"
+msgstr "Zmylk při aktualizaciji zdaleneho profila."
#: actions/getfile.php:79
msgid "No such file."
@@ -1663,7 +1667,7 @@ msgstr "Njepłaćiwa róla."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Tuta róla je wuměnjena a njeda so stajić."
#: actions/grantrole.php:75
msgid "You cannot grant user roles on this site."
@@ -1675,13 +1679,13 @@ msgstr "Wužiwar hižo ma tutu rólu."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Žadyn profil podaty."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Žadyn profil z tym ID."
@@ -1726,7 +1730,7 @@ msgstr "Tutoho wužiwarja za tutu skupinu blokować"
#: actions/groupblock.php:206
msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Zmylk datoweje banki blokuje wužiwarja za skupinu."
#: actions/groupbyid.php:74 actions/userbyid.php:70
msgid "No ID."
@@ -1777,12 +1781,12 @@ msgstr "Logo zaktualizowane."
#: actions/grouplogo.php:401
msgid "Failed updating logo."
-msgstr ""
+msgstr "Aktualizowanje loga je so njeporadźiło."
#: actions/groupmembers.php:100 lib/groupnav.php:92
#, php-format
msgid "%s group members"
-msgstr ""
+msgstr "%s skupinskich ÄÅ‚onow"
#: actions/groupmembers.php:103
#, php-format
@@ -1803,11 +1807,11 @@ msgstr "Blokować"
#: actions/groupmembers.php:487
msgid "Make user an admin of the group"
-msgstr ""
+msgstr "Wužiwarja k administratorej skupiny Äinić"
#: actions/groupmembers.php:519
msgid "Make Admin"
-msgstr ""
+msgstr "Za administratora pomjenować"
#: actions/groupmembers.php:519
msgid "Make this user an admin"
@@ -1817,7 +1821,7 @@ msgstr "Tutoho wužiwarja k administratorej Äinić"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr ""
@@ -1826,7 +1830,7 @@ msgstr ""
#: actions/grouprss.php:142
#, php-format
msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
+msgstr "Aktualizacije wot %1$s na %2$s!"
#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1874,6 +1878,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Jeli njemóžeš skupinu namakać, kotruž pytaš, móžeš [ju wutworić] (%%action."
+"newgroup%%)."
#: actions/groupsearch.php:85
#, php-format
@@ -1884,15 +1890,15 @@ msgstr ""
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Jenož administrator móže skupinskich ÄÅ‚onow wotblokować."
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
-msgstr ""
+msgstr "Wužiwar njeje zablokowany za skupinu."
#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
-msgstr ""
+msgstr "Zmylk při wotstronjenju blokowanja."
#. TRANS: Title for instance messaging settings.
#: actions/imsettings.php:60
@@ -1944,9 +1950,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Nastajenja"
+msgstr "IM-nastajenja"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2014,15 +2019,13 @@ msgstr "to je wopaÄna IM-adresa."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Abonoment njeje so daÅ‚ zniÄić."
+msgstr "IM-wobkrućenje njeda so zhašeć."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Wobkrućenje přetorhnjene."
+msgstr "IM-wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2032,32 +2035,34 @@ msgstr "To njeje twój ID Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Adresa bu wotstronjena."
+msgstr "IM-adresa bu wotstronjena."
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr ""
+msgstr "Dochadny póst za %1$s - strona %2$d"
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
-msgstr ""
+msgstr "Dochadny póst za %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
msgstr ""
+"To je twój dochadny póst, kotryž twoje priwatne dochadne powěsće nalistuje."
#: actions/invite.php:39
msgid "Invites have been disabled."
msgstr "Přeprošenja buchu znjemóžnjene."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+msgstr ""
+"Dyrbiš přizjewjeny być, zo by druheho wužiwarja přeprosył, zo by wón %s "
+"wužiwał."
#: actions/invite.php:72
#, php-format
@@ -2086,11 +2091,11 @@ msgstr "%1$s (%2$s)"
#: actions/invite.php:136
msgid ""
"These people are already users and you were automatically subscribed to them:"
-msgstr ""
+msgstr "Tući ludźo su hižo wužiwarjo a ty sy jich awtomatisce abonował:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Přeprošenja, kotrež buchu na slědowacych ludźi pósłane:"
#: actions/invite.php:150
msgid ""
@@ -2167,7 +2172,7 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
#: actions/joingroup.php:88 actions/leavegroup.php:88
msgid "No nickname or ID."
@@ -2178,7 +2183,7 @@ msgstr "Žane přimjeno abo žadyn ID."
#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "%1$s je do %2$s zastupił"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -2193,52 +2198,58 @@ msgstr "Njejsy ÄÅ‚on teje skupiny."
#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
-msgstr ""
+msgstr "%1$s je skupinu %2$s wopušćił"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Hižo přizjewjeny."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "WopaÄne wužiwarske mjeno abo hesÅ‚o."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Přizjewić"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Při sydle přizjewić"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Składować"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Hesło zhubjene abo zabyte?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
+"ProÅ¡u zapodaj z pÅ™iÄinow wÄ›stoty swoje wužiwarske mjeno znowa, prjedy haÄ "
+"změniš swoje nastajenja."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
+"Hišće nimaš wužiwarske mjeno? [Zregistruj (%%action.register%%) nowe konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2260,9 +2271,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s Äinić."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Žadyn aktualny status"
+msgstr "Žadyn aktualny status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2278,7 +2288,7 @@ msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "Žórłowy URL je trěbny."
#: actions/newapplication.php:258 actions/newapplication.php:267
msgid "Could not create application."
@@ -2349,7 +2359,7 @@ msgstr "Tekstowe pytanje"
#: actions/noticesearch.php:91
#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
+msgstr "Pytanske wuslědki za \"%1$s\" na %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -2368,7 +2378,7 @@ msgstr ""
#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr ""
+msgstr "Aktualizacije z \"%s\""
#: actions/noticesearchrss.php:98
#, php-format
@@ -2398,16 +2408,16 @@ msgstr "Aplikacije OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Aplikacije, za kotrež sy zregistrował"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Hišće njejsy aplikacije zregistrował."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Zwjazane aplikacije"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
@@ -2430,31 +2440,30 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Zdźělenka nima profil"
+msgstr "Zdźělenka nima profil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
-msgstr ""
+msgstr "Wobsahowy typ %s so njepodpěruje."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -2521,12 +2530,12 @@ msgstr "Přizjewjenske znamješko spadnjene."
#: actions/outbox.php:58
#, php-format
msgid "Outbox for %1$s - page %2$d"
-msgstr ""
+msgstr "Wuchadny póst za %1$s - strona %2$d"
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
-msgstr ""
+msgstr "Wuchadny póst za %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
@@ -2557,23 +2566,23 @@ msgid "6 or more characters"
msgstr "6 abo wjace znamješkow"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Wobkrućić"
#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
msgid "Same as password above"
-msgstr ""
+msgstr "Samsne hesło kaž horjeka"
#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Změnić"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hesle so njekryjetej."
@@ -2583,18 +2592,18 @@ msgstr "WopaÄne stare hesÅ‚o"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
-msgstr ""
+msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
-msgstr ""
+msgstr "Nowe hesło njeda so składować."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Hesło składowane."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Šćežki"
@@ -2603,19 +2612,19 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Å at njesteji k dispoziciji: %s"
+msgstr "Å atowy zapis njeda so Äitać: %s"
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Awatarowy zapis"
+msgstr "Do awataroweho zapisa njeda so pisać: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Pozadkowy zapis"
+msgstr "Do pozadkoweho zapisa njeda so pisać: %s."
#: actions/pathsadminpanel.php:177
#, php-format
@@ -2758,9 +2767,9 @@ msgid "People search"
msgstr "Za ludźimi pytać"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Njepłaćiwa e-mejlowa adresa."
+msgstr "NjepÅ‚aćiwa wosobowa tafliÄka: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2768,9 +2777,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr ""
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Njepłaćiwy wobsah zdźělenki"
+msgstr "Njepłaćiwy wobsah zdźělenki."
#: actions/postnotice.php:101
#, php-format
@@ -2785,6 +2793,8 @@ msgstr "Profilowe nastajenja"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
+"Móžeš swoje wosobinske profilowe informacije aktualizować, zo bychu ludźo "
+"wjace wo tebi zhonili."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2794,45 +2804,45 @@ msgstr "Profilowe informacije"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Dospołne mjeno"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Startowa strona"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+msgstr "Wopisaj sebje a swoje zajimy z %d znamješkami"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
-msgstr ""
+msgstr "Wopisaj sebje a swoje zajimy"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografija"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Městno"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
@@ -2870,7 +2880,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografija je předołha (maks. %d znamješkow)."
@@ -2898,7 +2908,7 @@ msgstr "Nastajenja městna njedachu so składować."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
-msgstr ""
+msgstr "Profil njeda so składować."
#: actions/profilesettings.php:383
msgid "Couldn't save tags."
@@ -2912,7 +2922,7 @@ msgstr "Nastajenja składowane."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "Limit stronow (%s) pÅ™ekroÄeny."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3020,11 +3030,11 @@ msgstr ""
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
-msgstr ""
+msgstr "Zmylk z wobkrućenskim kodom."
#: actions/recoverpassword.php:97
msgid "This confirmation code is too old. Please start again."
-msgstr ""
+msgstr "Tutón wobkrućenski kod je pÅ™estary. ProÅ¡u zapoÄÅ„ hišće raz."
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
@@ -3042,19 +3052,20 @@ msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Wobnowjenje hesła"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Přimjeno abo e-mejlowa adresa"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
msgstr ""
+"Twoje přimjeno na tutym serwerje abo twoje zregistrowana e-mejlowa adresa."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
-msgstr ""
+msgstr "Wobnowić"
#: actions/recoverpassword.php:208
msgid "Reset password"
@@ -3062,11 +3073,11 @@ msgstr "Hesło wróćo stajić"
#: actions/recoverpassword.php:209
msgid "Recover password"
-msgstr ""
+msgstr "Hesło wobnowić"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
-msgstr ""
+msgstr "Wobnowjenje hesła požadane"
#: actions/recoverpassword.php:213
msgid "Unknown action"
@@ -3095,7 +3106,7 @@ msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Zmylk při składowanju adresoweho wobkrućenja."
#: actions/recoverpassword.php:338
msgid ""
@@ -3113,88 +3124,110 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Hesło a jeho wobkrućenje so njekryjetej."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
-msgstr ""
+msgstr "Zmylk při nastajenju wužiwarja."
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Wodaj, njepłaćiwy přeprošenski kod."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registracija njedowolena."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-mejlowa adresa hižo eksistuje."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 abo wjace znamješkow. Trěbne."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Jenake kaž hesło horjeka. Trěbne."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mejl"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Wšě prawa wuměnjenjene."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3213,7 +3246,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3229,11 +3262,11 @@ msgstr ""
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "Zdaleny abonement"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "Zdaleneho wužiwarja abonować"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -3266,7 +3299,7 @@ msgstr ""
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "To je lokalny profil! Přizjew so, zo by abonował."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
@@ -3288,7 +3321,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować."
msgid "You already repeated that notice."
msgstr "Sy tutu zdźělenku hižo wospjetował."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Wospjetowany"
@@ -3356,7 +3389,7 @@ msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
msgid "User doesn't have this role."
msgstr "Wužiwar nima tutu rólu."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3370,7 +3403,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Posedźenja"
@@ -3410,10 +3443,10 @@ msgstr "Aplikaciski profil"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Symbol"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Mjeno"
@@ -3424,7 +3457,7 @@ msgid "Organization"
msgstr "Organizacija"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Wopisanje"
@@ -3441,7 +3474,7 @@ msgstr ""
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Aplikaciske akcije"
#: actions/showapplication.php:236
msgid "Reset key & secret"
@@ -3449,7 +3482,7 @@ msgstr ""
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Aplikaciske informacije"
#: actions/showapplication.php:263
msgid "Consumer key"
@@ -3533,7 +3566,7 @@ msgstr ""
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "skupina %s"
#: actions/showgroup.php:84
#, php-format
@@ -3634,12 +3667,12 @@ msgstr ""
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Powěsć do %1$s na %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Powěsć wot %1$s na %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
@@ -3763,7 +3796,7 @@ msgstr "Sydłowe mjeno"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Mjeno twojeho sydła, kaž \"TwojePředewzaće Microblog\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -3795,7 +3828,7 @@ msgstr "Standardne Äasowe pasmo"
#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Standardne Äasowe pasmo za sydÅ‚o; zwjetÅ¡a UTC."
#: actions/siteadminpanel.php:262
msgid "Default language"
@@ -3872,9 +3905,8 @@ msgstr "SMS k dispoziciji njesteji."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM-adresa"
+msgstr "SMS-adresa"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -3889,7 +3921,7 @@ msgstr ""
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:142
msgid "Confirmation code"
-msgstr ""
+msgstr "Wobkrućenski kod"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
@@ -3898,7 +3930,6 @@ msgstr ""
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Wobkrućić"
@@ -3915,9 +3946,8 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Nastajenja"
+msgstr "SMS-nastajenja"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -3928,9 +3958,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Nastajenja składowane."
+msgstr "SMS-nastajenja składowane."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -3962,25 +3991,23 @@ msgstr ""
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "To je wopaÄne wobkrućenske ÄisÅ‚o."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Wobkrućenje přetorhnjene."
+msgstr "SMS-wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
#: actions/smssettings.php:448
msgid "That is not your phone number."
-msgstr ""
+msgstr "To twoje telefonowe ÄisÅ‚o njeje."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "SMS telefonowe ÄisÅ‚o"
+msgstr "Telefonowe ÄisÅ‚o za SMS bu wotstronjene."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4008,7 +4035,7 @@ msgstr "Žadyn kod zapodaty"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4070,7 +4097,7 @@ msgstr "Njejsy tón profil abonował."
#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
-msgstr ""
+msgstr "Abonement njeda so składować."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
@@ -4116,7 +4143,7 @@ msgstr ""
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s abonentow nima. Chceš prěni być?"
#: actions/subscribers.php:114
#, php-format
@@ -4249,9 +4276,8 @@ msgid "User is not silenced."
msgstr ""
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "Žadyn profil z tym ID."
+msgstr "Žadyn profilowy ID w naprašowanju."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4284,7 +4310,7 @@ msgstr ""
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+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
@@ -4334,7 +4360,7 @@ msgstr ""
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "Abonement awtorizować"
#: actions/userauthorization.php:110
msgid ""
@@ -4343,7 +4369,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licenca"
@@ -4366,7 +4392,7 @@ msgstr "Tutón abonement wotpokazać"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "Žane awtorizaciske naprašowanje!"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
@@ -4413,7 +4439,7 @@ msgstr ""
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "URL awatara '%s' njeje płaćiwy"
#: actions/userauthorization.php:350
#, php-format
@@ -4423,7 +4449,7 @@ msgstr ""
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "WopaÄny wobrazowy typ za awatarowy URL '%s'."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
@@ -4447,12 +4473,12 @@ msgstr "%1$s skupinow, strona %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
-msgstr ""
+msgstr "Dalše skupiny pytać"
#: actions/usergroups.php:159
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "%s ÄÅ‚on w žanej skupinje njeje."
#: actions/usergroups.php:164
#, php-format
@@ -4464,29 +4490,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Aktualizacije wot %1$s na %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
-msgstr ""
+msgstr "Sobuskutkowarjo"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4494,7 +4520,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4502,39 +4528,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
-msgstr ""
+msgstr "TykaÄe"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Wersija"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Awtorojo"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4566,52 +4592,52 @@ msgstr ""
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Powěsć njeda so zasunyć."
#: classes/Message.php:71
msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+msgstr "Zmylk datoweje banki pÅ™i zasunjenju haÅ¡eje tafliÄki: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4647,11 +4673,11 @@ msgstr "Abonoment njeje so daÅ‚ zniÄić."
#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Witaj do %1$s, @%2$s!"
#: classes/User_group.php:480
msgid "Could not create group."
-msgstr ""
+msgstr "Skupina njeda so wutowrić."
#: classes/User_group.php:489
msgid "Could not set group URI."
@@ -4659,7 +4685,7 @@ msgstr "URI skupiny njeda so nastajić."
#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr ""
+msgstr "Skupinske ÄÅ‚onstwo njeda so stajić."
#: classes/User_group.php:524
msgid "Could not save local group info."
@@ -4668,17 +4694,17 @@ msgstr "Informacije wo lokalnej skupinje njedachu so składować."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
-msgstr ""
+msgstr "Twoje profilowe nastajenja změnić"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:116
msgid "Upload an avatar"
-msgstr ""
+msgstr "Awatar nahrać"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:123
msgid "Change your password"
-msgstr ""
+msgstr "Twoje hesło změnić"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
@@ -4712,188 +4738,188 @@ msgid "Untitled page"
msgstr "Strona bjez titula"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Wosobinski"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ze słužbami zwjazać"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Zwjazać"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Sydłowu konfiguraciju změnić"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Přeprosyć"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Ze sydła wotzjewić"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Wotzjewić"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Konto załožić"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrować"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Při sydle přizjewić"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Přizjewjenje"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Pytać"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Pomoc"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Wo"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Huste prašenja"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Priwatnosć"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Žórło"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4901,13 +4927,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4916,54 +4942,54 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr ""
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -4971,18 +4997,18 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Njemóžeš tute sydło změnić."
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
@@ -4992,12 +5018,12 @@ msgstr "Změny na tutym woknje njejsu dowolene."
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() njeimplementowany."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() njeimplementowany."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
@@ -5006,76 +5032,76 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
-msgstr ""
+msgstr "Zakładna sydłowa konfiguracija"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Sydło"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Design"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Wužiwarska konfiguracija"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Wužiwar"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Přistupna konfiguracija"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Konfiguracija posedźenjow"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Sydłowu zdźělenku wobdźěłać"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Konfiguracija wobrazowkowych fotow"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "Aplikaciju wobdźěłać"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Symbol za tutu aplikaciju"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
@@ -5101,12 +5127,12 @@ msgstr "URL žórła"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organizacija, kotraž je za tutu aplikaciju zamołwita"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "URL za startowu stronu organizacije"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
@@ -5116,12 +5142,12 @@ msgstr ""
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Wobhladowak"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "Desktop"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
@@ -5131,12 +5157,12 @@ msgstr ""
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "Jenož Äitajomny"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "Popisujomny"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
@@ -5151,12 +5177,12 @@ msgstr "Přetorhnyć"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "popisujomny"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "jenož Äitajomny"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
@@ -5166,7 +5192,6 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Wotwołać"
@@ -5174,7 +5199,7 @@ msgstr "Wotwołać"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
msgid "Attachments"
-msgstr ""
+msgstr "Přiwěški"
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:265
@@ -5184,7 +5209,7 @@ msgstr "Awtor"
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:279
msgid "Provider"
-msgstr ""
+msgstr "Poskićowar"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
@@ -5194,17 +5219,17 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Změnjenje hesła je so njeporadźiło"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Změnjenje hesła njeje dowolene"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Přikazowe wuslědki"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
@@ -5212,7 +5237,7 @@ msgstr ""
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "Přikaz je so njeporadźił"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
@@ -5227,18 +5252,18 @@ msgstr "Wužiwar nima poslednju powěsć"
#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
+msgstr "Wužiwar z přimjenom %s njeda so namakać"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr ""
+msgstr "Lokalny wužiwar z přimjenom %s njeda so namakać"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Tutón přikaz hišće njeje implementowany."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
@@ -5277,9 +5302,9 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
+msgstr "Njebě móžno, wužiwarja %1$s ze skupiny %2$s wotstronić"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5289,17 +5314,17 @@ msgstr "Dospołne mjeno: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Městno: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Startowa strona: %s"
#. TRANS: Whois output. %s is the bio information of the queried user.
#: lib/command.php:430
@@ -5320,6 +5345,7 @@ msgstr ""
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
+"Powěsć předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d pósłał"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5330,7 +5356,7 @@ msgstr "Direktna powěsć do %s pósłana"
#: lib/command.php:494
msgid "Error sending direct message."
-msgstr ""
+msgstr "Zmylk při słanju direktneje powěsće,"
#: lib/command.php:514
msgid "Cannot repeat your own notice"
@@ -5367,7 +5393,7 @@ msgstr ""
#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować"
#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
@@ -5376,20 +5402,20 @@ msgstr "OMB-profile njedadźa so přez přikaz abonować."
#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "%s abonowany"
#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Podaj mjeno wužiwarja, kotrehož chceš wotskazać"
#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "%s wotskazany"
#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
-msgstr ""
+msgstr "Přikaz hišće njeimplementowany."
#: lib/command.php:685
msgid "Notification off."
@@ -5409,7 +5435,7 @@ msgstr ""
#: lib/command.php:723
msgid "Login command is disabled"
-msgstr ""
+msgstr "Přizjewjenski přikaz je znjemóžnjeny"
#: lib/command.php:734
#, php-format
@@ -5423,7 +5449,7 @@ msgstr "%s wotskazany"
#: lib/command.php:778
msgid "You are not subscribed to anyone."
-msgstr ""
+msgstr "Njejsy nikoho abonował."
#: lib/command.php:780
msgid "You are subscribed to this person:"
@@ -5435,7 +5461,7 @@ msgstr[3] "Sy tute wosoby abonował:"
#: lib/command.php:800
msgid "No one is subscribed to you."
-msgstr ""
+msgstr "Nichtó njeje će abonował."
#: lib/command.php:802
msgid "This person is subscribed to you:"
@@ -5447,7 +5473,7 @@ msgstr[3] "Tute wosoby su će abonowali:"
#: lib/command.php:822
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "Njejsy ÄÅ‚on w žanej skupinje."
#: lib/command.php:824
msgid "You are a member of this group:"
@@ -5505,15 +5531,15 @@ msgstr "Žana konfiguraciska dataja namakana. "
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Sym na slědowacych městnach za konfiguraciskimi datajemi pytał: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjedźił."
#: lib/common.php:139
msgid "Go to the installer."
-msgstr ""
+msgstr "K instalaciji"
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -5521,11 +5547,11 @@ msgstr "IM"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Aktualizacije přez Instant Messenger (IM)"
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Aktualizacije přez SMS"
#: lib/connectsettingsaction.php:120
msgid "Connections"
@@ -5533,7 +5559,7 @@ msgstr "Zwiski"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Awtorizowane zwjazane aplikacije"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -5547,6 +5573,8 @@ msgstr "Dataju nahrać"
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Móžeš swój wosobinski pozadkowy wobraz nahrać. Maksimalna datajowa wulkosć "
+"je 2 MB."
#: lib/designsettings.php:418
msgid "Design defaults restored."
@@ -5582,7 +5610,7 @@ msgstr "FOAF"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Daty eksportować"
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5606,7 +5634,7 @@ msgstr ""
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "Start"
#: lib/grantroleform.php:91
#, php-format
@@ -5630,6 +5658,8 @@ msgstr "Skupinu abo temu w %d znamješkach wopisać"
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
msgstr ""
+"Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
+"region), kraj\""
#: lib/groupeditform.php:187
#, php-format
@@ -5652,7 +5682,7 @@ msgstr ""
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Kajkosće skupiny %s wobdźěłać"
#: lib/groupnav.php:113
msgid "Logo"
@@ -5685,15 +5715,17 @@ msgstr ""
#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
msgstr ""
+"Tuta strona we wot tebje akceptowanym medijowym typje k dispoziciji "
+"njesteji."
#: lib/imagefile.php:72
msgid "Unsupported image file format."
-msgstr ""
+msgstr "Njepodpěrowany wobrazowy format."
#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Tuta dataja je přewulka. Maksimalna datajowa wulkosć je %s."
#: lib/imagefile.php:93
msgid "Partial upload."
@@ -5701,11 +5733,11 @@ msgstr "Dźělne nahraće."
#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr ""
+msgstr "Systemowy zmylk při nahrawanju dataje."
#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "Žady wobraz abo žana wobškodźena dataja."
#: lib/imagefile.php:122
msgid "Lost our file."
@@ -5735,7 +5767,7 @@ msgstr "Njeznate žórło postoweho kašćika %d."
#: lib/joinform.php:114
msgid "Join"
-msgstr ""
+msgstr "Zastupić"
#: lib/leaveform.php:114
msgid "Leave"
@@ -5778,8 +5810,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5795,19 +5834,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografija: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5821,30 +5860,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-wobkrućenje"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5861,13 +5900,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nowa priwatna powěsć wot %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5887,13 +5926,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5915,21 +5954,24 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"DospoÅ‚nu rozmoÅ‚wu móžes tu Äitać:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5958,7 +6000,7 @@ msgstr ""
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Jenož wužiwar móže swoje póstowe kašćiki Äitać."
#: lib/mailbox.php:139
msgid ""
@@ -5966,13 +6008,13 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "wot"
#: lib/mailhandler.php:37
msgid "Could not parse message."
-msgstr ""
+msgstr "Powěsć njeda so analyzować."
#: lib/mailhandler.php:42
msgid "Not a registered user."
@@ -5994,6 +6036,8 @@ msgstr "Njepodpěrany powěsćowy typ: %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Při składowanju twojeje dataje je zmylk w datowej bance wustupił. Prošu "
+"spytaj hišće raz."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -6015,11 +6059,11 @@ msgstr "Temporerny rjadowka faluje."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Dataju njeda so na taÄel pisać."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Datajowe nahraće přez rozšěrjenje zastajene."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
@@ -6027,16 +6071,16 @@ msgstr ""
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Dataja njeda so do ciloweho zapisa přesunyć."
#: lib/mediafile.php:201 lib/mediafile.php:237
msgid "Could not determine file's MIME type."
-msgstr ""
+msgstr "MIME-typ dataje njeda so zwěsćić."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr "Spytaj druhi format %s."
#: lib/mediafile.php:275
#, php-format
@@ -6067,7 +6111,7 @@ msgstr "Zdźělenku pósłać"
#: lib/noticeform.php:173
#, php-format
msgid "What's up, %s?"
-msgstr ""
+msgstr "Å to je, %s?"
#: lib/noticeform.php:192
msgid "Attach"
@@ -6120,23 +6164,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
-msgstr ""
+msgstr "w konteksće"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Wospjetowany wot"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Na tutu zdźělenku wotmołwić"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Wotmołwić"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Zdźělenka wospjetowana"
@@ -6162,7 +6206,7 @@ msgstr "Zmylk při zasunjenju awatara"
#: lib/oauthstore.php:306
msgid "Error updating remote profile"
-msgstr ""
+msgstr "Zmylk při aktualizowanju zdaleneho profila"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
@@ -6174,7 +6218,7 @@ msgstr "Dwójna zdźělenka"
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Nowy abonement njeda so zasunyć."
#: lib/personalgroupnav.php:99
msgid "Personal"
@@ -6190,7 +6234,7 @@ msgstr "Fawority"
#: lib/personalgroupnav.php:125
msgid "Inbox"
-msgstr ""
+msgstr "Dochadny póst"
#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
@@ -6198,7 +6242,7 @@ msgstr "Twoje dochadźace powěsće"
#: lib/personalgroupnav.php:130
msgid "Outbox"
-msgstr ""
+msgstr "Wuchadny póst"
#: lib/personalgroupnav.php:131
msgid "Your sent messages"
@@ -6209,7 +6253,7 @@ msgstr "Twoje pósłane powěsće"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Njeznaty"
@@ -6240,15 +6284,15 @@ msgstr "Čłon wot"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Dnjowy přerězk"
#: lib/profileaction.php:264
msgid "All groups"
msgstr "WÅ¡Ä› skupiny"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
-msgstr ""
+msgstr "Njeimplementowana metoda."
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -6270,7 +6314,7 @@ msgstr ""
msgid "Popular"
msgstr "Woblubowany"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Žane wróćenske argumenty."
@@ -6291,9 +6335,9 @@ msgstr "Tutu zdźělenku wospjetować"
msgid "Revoke the \"%s\" role from this user"
msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -6354,17 +6398,17 @@ msgstr ""
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr ""
+msgstr "Ludźo, kotrychž %s abonuje"
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr ""
+msgstr "Ludźo, kotřiž su %s abonowali"
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Skupiny, w kotrychž %s je ÄÅ‚on"
#: lib/subgroupnav.php:105
msgid "Invite"
@@ -6389,6 +6433,48 @@ msgstr ""
msgid "None"
msgstr "Žadyn"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Nahraće šata faluje abo je so njeporadźiło."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Składowanje šata je so njeporadźiło."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Zmylk pÅ™i woÄinjenju Å¡atoweho archiwa."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6432,7 +6518,7 @@ msgstr "Wužiwarske akcije"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "Wužiwar so haša..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
@@ -6452,7 +6538,7 @@ msgstr "Powěsć"
#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "Moderěrować"
#: lib/userprofile.php:364
msgid "User role"
@@ -6466,59 +6552,59 @@ msgstr "Administrator"
#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "před něšto sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
@@ -6538,3 +6624,5 @@ msgstr ""
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index cda28819e..cc699cef4 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:04+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:03+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -21,7 +21,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Accesso"
@@ -83,25 +83,24 @@ msgid "Save"
msgstr "Salveguardar"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Pagina non existe"
+msgstr "Pagina non existe."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -114,7 +113,7 @@ msgid "No such user."
msgstr "Usator non existe."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amicos, pagina %2$d"
@@ -122,33 +121,33 @@ msgstr "%1$s e amicos, pagina %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s e amicos"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Syndication pro le amicos de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Syndication pro le amicos de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Syndication pro le amicos de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -156,7 +155,7 @@ msgstr ""
"Isto es le chronologia pro %s e su amicos, ma necuno ha ancora publicate "
"alique."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -166,7 +165,7 @@ msgstr ""
"action.groups%%) o publica alique tu mesme."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -175,7 +174,7 @@ msgstr ""
"Tu pote tentar [dar un pulsata a %1$s](../%2$s) in su profilo o [publicar un "
"message a su attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,67 +184,66 @@ msgstr ""
"pulsata a %s o publicar un message a su attention."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Tu e amicos"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualisationes de %1$s e su amicos in %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Methodo API non trovate."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Iste methodo require un POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"Tu debe specificar un parametro nominate 'device' con un del valores: sms, "
-"im, none"
+"im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Non poteva actualisar le usator."
@@ -265,7 +263,7 @@ msgstr "Non poteva salveguardar le profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -324,41 +322,41 @@ msgstr "Messages directe a %s"
msgid "All the direct messages sent to %s"
msgstr "Tote le messages directe inviate a %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Message sin texto!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Isto es troppo longe. Le maximo es %d characteres."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Usator destinatario non trovate."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Nulle stato trovate con iste ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Iste stato es ja favorite."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Non poteva crear le favorite."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Iste stato non es favorite."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Non poteva deler le favorite."
@@ -391,120 +389,119 @@ msgstr "Non poteva determinar le usator de origine."
msgid "Could not find target user."
msgstr "Non poteva trovar le usator de destination."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Non un pseudonymo valide."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Le pagina personal non es un URL valide."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Description es troppo longe (max %d charachteres)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Loco es troppo longe (max. 255 characteres)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Troppo de aliases! Maximo: %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Alias invalide: \"%s\""
+msgstr "Alias invalide: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Le alias non pote esser identic al pseudonymo."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "Gruppo non trovate!"
+msgstr "Gruppo non trovate."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Tu es ja membro de iste gruppo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Le administrator te ha blocate de iste gruppo."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Tu non es membro de iste gruppo."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Gruppos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#: actions/apigrouplist.php:108
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Gruppos del quales %s es membro"
+msgstr "Gruppos de %1$s del quales %2$s es membro."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Gruppos de %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "gruppos in %s"
@@ -519,15 +516,15 @@ msgstr "Indicio invalide."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -596,12 +593,12 @@ msgstr ""
"accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Conto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -609,8 +606,8 @@ msgid "Nickname"
msgstr "Pseudonymo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasigno"
@@ -626,11 +623,11 @@ msgstr "Permitter"
msgid "Allow or deny access to your account information."
msgstr "Permitter o refusar accesso al informationes de tu conto."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Iste methodo require un commando POST o DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Tu non pote deler le stato de un altere usator."
@@ -647,26 +644,26 @@ msgstr "Non pote repeter tu proprie nota."
msgid "Already repeated that notice."
msgstr "Iste nota ha ja essite repetite."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Stato delite."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Nulle stato trovate con iste ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Isto es troppo longe. Le longitude maximal del notas es %d characteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trovate."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -677,33 +674,33 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato non supportate."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorites de %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualisationes favoritisate per %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualisationes que mentiona %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Chronologia public de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Actualisationes de totes in %s!"
@@ -718,12 +715,12 @@ msgstr "Repetite a %s"
msgid "Repeats of %s"
msgstr "Repetitiones de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notas con etiquetta %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualisationes con etiquetta %1$s in %2$s!"
@@ -781,7 +778,7 @@ msgid "Preview"
msgstr "Previsualisation"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Deler"
@@ -821,11 +818,11 @@ msgstr "Avatar delite."
msgid "You already blocked that user."
msgstr "Tu ha ja blocate iste usator."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocar usator"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -840,17 +837,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non blocar iste usator"
@@ -859,20 +855,19 @@ msgstr "Non blocar iste usator"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocar iste usator"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
@@ -918,9 +913,9 @@ msgstr "Disblocar iste usator"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Publicar in "
+msgstr "Publicar in %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -936,9 +931,9 @@ msgstr "Iste codice de confirmation non es pro te!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Typo de adresse %s non recognoscite"
+msgstr "Le typo de adresse %s non es recognoscite."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -999,7 +994,7 @@ msgstr "Tu non es le proprietario de iste application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -1033,7 +1028,7 @@ msgstr "Deler iste application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non identificate."
@@ -1064,7 +1059,7 @@ msgid "Do not delete this notice"
msgstr "Non deler iste nota"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Deler iste nota"
@@ -1104,45 +1099,55 @@ msgstr "Apparentia"
msgid "Design settings for this StatusNet site."
msgstr "Configuration del apparentia de iste sito StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL de logotypo invalide."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "Thema non disponibile: %s"
+msgstr "Thema non disponibile: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Cambiar logotypo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logotypo del sito"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Cambiar thema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Thema del sito"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Le thema de apparentia pro le sito."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Apparentia personalisate"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Cambiar imagine de fundo"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1152,57 +1157,65 @@ msgstr ""
"file es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Active"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Non active"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar o disactivar le imagine de fundo."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tegular le imagine de fundo"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Contento"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Ligamines"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avantiate"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "CSS personalisate"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar predefinitiones"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar apparentias predefinite"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir al predefinitiones"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1212,7 +1225,7 @@ msgstr "Revenir al predefinitiones"
msgid "Save"
msgstr "Salveguardar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Salveguardar apparentia"
@@ -1365,7 +1378,6 @@ msgstr "Adresse de e-mail actualmente confirmate."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
@@ -1384,7 +1396,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancellar"
@@ -1399,7 +1410,6 @@ msgstr "Le adresse de e-mail, como \"nomine@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Adder"
@@ -1426,16 +1436,14 @@ msgstr ""
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nove"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferentias"
+msgstr "Preferentias de e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1474,9 +1482,8 @@ msgstr "Publicar un MicroID pro mi adresse de e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Preferentias de apparentia salveguardate."
+msgstr "Preferentias de e-mail salveguardate."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1489,7 +1496,7 @@ msgid "Cannot normalize that email address"
msgstr "Non pote normalisar iste adresse de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
@@ -1532,15 +1539,13 @@ msgstr "Nulle confirmation pendente a cancellar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Iste adresse de messageria instantanee es erronee."
+msgstr "Iste adresse de e-mail es erronee."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmation cancellate."
+msgstr "Confirmation de e-mail cancellate."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1550,9 +1555,8 @@ msgstr "Isto non es tu adresse de e-mail."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Le adresse ha essite removite."
+msgstr "Le adresse de e-mail ha essite removite."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1690,9 +1694,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Le servicio remote usa un version incognite del protocollo OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Error in actualisar le profilo remote"
+msgstr "Error durante le actualisation del profilo remote."
#: actions/getfile.php:79
msgid "No such file."
@@ -1720,13 +1723,13 @@ msgstr "Le usator ha ja iste rolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nulle profilo specificate."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Non existe un profilo con iste ID."
@@ -1867,7 +1870,7 @@ msgstr "Facer iste usator administrator"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Chronologia de %s"
@@ -2012,9 +2015,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferentias"
+msgstr "Preferentias de messageria instantanee"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2086,15 +2088,13 @@ msgstr "Iste adresse de messageria instantanee es erronee."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Non poteva deler confirmation de e-mail."
+msgstr "Non poteva deler confirmation de messageria instantanee."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmation cancellate."
+msgstr "Confirmation de messageria instantanee cancellate."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2104,9 +2104,8 @@ msgstr "Isto non es tu ID de Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Le adresse ha essite removite."
+msgstr "Le adresse de messageria instantanee ha essite removite."
#: actions/inbox.php:59
#, php-format
@@ -2129,9 +2128,9 @@ msgid "Invites have been disabled."
msgstr "Le invitationes ha essite disactivate."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s"
+msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s."
#: actions/invite.php:72
#, php-format
@@ -2298,42 +2297,42 @@ msgstr "Tu non es membro de iste gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s quitava le gruppo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Tu es ja identificate."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nomine de usator o contrasigno incorrecte."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Error de acceder al conto de usator. Tu probabilemente non es autorisate."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aperir session"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Identificar te a iste sito"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Memorar me"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Aperir session automaticamente in le futuro; non pro computatores usate in "
"commun!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Contrasigno perdite o oblidate?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2341,14 +2340,16 @@ msgstr ""
"Pro motivos de securitate, per favor re-entra tu nomine de usator e "
"contrasigno ante de cambiar tu configurationes."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Aperi un session con tu nomine de usator e contrasigno."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un "
-"nomine de usator? [Crea](%%action.register%%) un nove conto."
+"Non ha ancora un nomine de usator? [Crea](%%action.register%%) un nove conto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2370,9 +2371,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Non pote facer %1$s administrator del gruppo %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Nulle stato actual"
+msgstr "Nulle stato actual."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2539,9 +2539,9 @@ msgid "You are not a user of that application."
msgstr "Tu non es usator de iste application."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Impossibile revocar le accesso del application: "
+msgstr "Impossibile revocar le accesso del application: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2553,31 +2553,30 @@ msgstr ""
"Le programmatores pote modificar le parametros de registration pro lor "
"applicationes "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Le nota ha nulle profilo"
+msgstr "Le nota ha nulle profilo."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Le stato de %1$s in %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "typo de contento "
+msgstr "Le typo de contento %s non es supportate."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Solmente le URLs %s es permittite super HTTP simple."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2681,7 +2680,7 @@ msgid "6 or more characters"
msgstr "6 o plus characteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2693,11 +2692,11 @@ msgstr "Identic al contrasigno hic supra"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Le contrasigno debe haber al minus 6 characteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Le contrasignos non corresponde."
@@ -2718,7 +2717,7 @@ msgid "Password saved."
msgstr "Contrasigno salveguardate."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Camminos"
@@ -2727,24 +2726,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Configuration de cammino e servitor pro iste sito StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Directorio de thema non legibile: %s"
+msgstr "Directorio de thema non legibile: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Directorio de avatar non scriptibile: %s"
+msgstr "Directorio de avatar non scriptibile: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Directorio de fundo non scriptibile: %s"
+msgstr "Directorio de fundo non scriptibile: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Directorio de localitates non scriptibile: %s"
+msgstr "Directorio de localitates non scriptibile: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2884,9 +2883,9 @@ msgid "People search"
msgstr "Recerca de personas"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Etiquetta de personas invalide: %s"
+msgstr "Etiquetta de personas invalide: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2894,9 +2893,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Le contento del nota es invalide"
+msgstr "Le contento del nota es invalide."
#: actions/postnotice.php:101
#, php-format
@@ -2924,43 +2922,43 @@ msgstr "Information de profilo"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nomine complete"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina personal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL de tu pagina personal, blog o profilo in un altere sito"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Describe te e tu interesses in %d characteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Describe te e tu interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Loco"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
@@ -3003,7 +3001,7 @@ msgid ""
msgstr ""
"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio es troppo longe (max %d chars)."
@@ -3043,9 +3041,9 @@ msgid "Settings saved."
msgstr "Preferentias confirmate."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Ultra le limite de pagina (%s)"
+msgstr "Ultra le limite de pagina (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3264,7 +3262,7 @@ msgstr "Le contrasigno debe haber 6 characteres o plus."
msgid "Password and confirmation do not match."
msgstr "Contrasigno e confirmation non corresponde."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error durante le configuration del usator."
@@ -3272,40 +3270,39 @@ msgstr "Error durante le configuration del usator."
msgid "New password successfully saved. You are now logged in."
msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Pardono, solmente le personas invitate pote registrar se."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Pardono, le codice de invitation es invalide."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear conto"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registration non permittite."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Tu non pote crear un conto si tu non accepta le licentia."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Le adresse de e-mail existe ja."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
-#: actions/register.php:343
-#, fuzzy
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3313,44 +3310,68 @@ msgstr ""
"Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
"notas e mitter te in contacto con amicos e collegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o plus characteres. Requirite."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Identic al contrasigno hic supra. Requirite."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Usate solmente pro actualisationes, notificationes e recuperation de "
"contrasigno"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"io comprende que le contento e datos de %1$s es private e confidential."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Le derecto de autor pro mi texto e files resta in mi possession."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Tote le derectos reservate."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-" excepte iste datos private: contrasigno, adresse de e-mail, adresse de "
-"messageria instantanee, numero de telephono."
+"Mi texto e files es disponibile sub %s excepte iste datos private: "
+"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
+"telephono."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3382,7 +3403,7 @@ msgstr ""
"\n"
"Gratias pro inscriber te, e nos spera que iste servicio te place."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3465,7 +3486,7 @@ msgstr "Tu non pote repeter tu proprie nota."
msgid "You already repeated that notice."
msgstr "Tu ha ja repetite iste nota."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetite"
@@ -3539,7 +3560,7 @@ msgstr "Tu non pote revocar rolos de usatores in iste sito."
msgid "User doesn't have this role."
msgstr "Le usator non ha iste rolo."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3553,7 +3574,7 @@ msgstr "Usator es ja in cassa de sablo."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessiones"
@@ -3596,7 +3617,7 @@ msgid "Icon"
msgstr "Icone"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nomine"
@@ -3607,7 +3628,7 @@ msgid "Organization"
msgstr "Organisation"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Description"
@@ -3965,9 +3986,8 @@ msgid "Minimum text limit is 0 (unlimited)."
msgstr "Le limite minimal del texto es 0 (illimitate)."
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
-msgstr "Le limite de duplicatos debe esser 1 o plus secundas."
+msgstr "Le limite de duplicatos debe esser un o plus secundas."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -4058,9 +4078,8 @@ msgid "Unable to save site notice."
msgstr "Impossibile salveguardar le aviso del sito."
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres"
+msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -4094,9 +4113,8 @@ msgstr "SMS non es disponibile."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Adresse de messageria instantanee"
+msgstr "Adresse SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4120,7 +4138,6 @@ msgstr "Entra le codice que tu ha recipite in tu telephono."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirmar"
@@ -4137,9 +4154,8 @@ msgstr "Numero de telephono, sin punctuation o spatios, con indicativo"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferentias"
+msgstr "Preferentias de SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4152,9 +4168,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferentias confirmate."
+msgstr "Preferentias de SMS confirmate."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4192,9 +4207,8 @@ msgstr "Iste codice de confirmation es incorrecte."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmation cancellate."
+msgstr "Confirmation de SMS cancellate."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4204,9 +4218,8 @@ msgstr "Isto non es tu numero de telephono."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Numero de telephono pro SMS"
+msgstr "Le numero de telephono pro SMS ha essite removite."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4237,7 +4250,7 @@ msgstr "Nulle codice entrate"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Instantaneos"
@@ -4258,7 +4271,6 @@ msgid "Invalid snapshot report URL."
msgstr "Le URL pro reportar instantaneos es invalide."
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "Aleatorimente durante un accesso web"
@@ -4494,7 +4506,6 @@ msgid "User is not silenced."
msgstr "Le usator non es silentiate."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "Nulle ID de profilo in requesta."
@@ -4592,7 +4603,7 @@ 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\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licentia"
@@ -4603,7 +4614,7 @@ msgstr "Acceptar"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "Subscriber me a iste usator"
+msgstr "Subscriber a iste usator"
#: actions/userauthorization.php:219
msgid "Reject"
@@ -4722,18 +4733,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Actualisationes de %1$s in %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4742,11 +4753,11 @@ msgstr ""
"Iste sito es realisate per %1$s version %2$s, copyright 2008-2010 StatusNet, "
"Inc. e contributores."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Contributores"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4758,7 +4769,7 @@ msgstr ""
"Free Software Foundation, o version 3 de iste licentia, o (a vostre "
"election) omne version plus recente. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4770,7 +4781,7 @@ msgstr ""
"USABILITATE PRO UN PARTICULAR SCOPO. Vide le GNU Affero General Public "
"License pro ulterior detalios. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4779,20 +4790,20 @@ msgstr ""
"Un copia del GNU Affero General Public License deberea esser disponibile "
"insimul con iste programma. Si non, vide %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Plug-ins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Version"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autor(es)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4801,12 +4812,12 @@ msgstr ""
"Nulle file pote esser plus grande que %d bytes e le file que tu inviava ha %"
"d bytes. Tenta incargar un version minus grande."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Un file de iste dimension excederea tu quota de usator de %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Un file de iste dimension excederea tu quota mensual de %d bytes."
@@ -4845,27 +4856,27 @@ msgid "Could not update message with new URI."
msgstr "Non poteva actualisar message con nove URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problema salveguardar nota. Troppo longe."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problema salveguardar nota. Usator incognite."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Troppo de notas troppo rapidemente; face un pausa e publica de novo post "
"alcun minutas."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4873,21 +4884,21 @@ msgstr ""
"Troppo de messages duplicate troppo rapidemente; face un pausa e publica de "
"novo post alcun minutas."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Il te es prohibite publicar notas in iste sito."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4988,204 +4999,204 @@ msgid "Untitled page"
msgstr "Pagina sin titulo"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navigation primari del sito"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personal e chronologia de amicos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connecter a servicios"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modificar le configuration del sito"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invitar amicos e collegas a accompaniar te in %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar le session del sito"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Clauder session"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear un conto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Crear conto"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Identificar te a iste sito"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Aperir session"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Adjuta me!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Adjuta"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cercar personas o texto"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Cercar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Aviso del sito"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Vistas local"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Aviso de pagina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Navigation secundari del sito"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Adjuta"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "A proposito"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "CdS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Confidentialitate"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licentia del software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%"
-"%](%%site.broughtbyurl%%). "
+"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** es un servicio de microblog."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5197,55 +5208,55 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licentia del contento del sito"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contento e datos de %1$s es private e confidential."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Contento e datos sub copyright del contributores. Tote le derectos reservate."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+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:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Ante"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
@@ -5255,11 +5266,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr "Non pote ancora tractar contento remote."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Non pote ancora tractar contento XML incastrate."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Non pote ancora tractar contento Base64 incastrate."
@@ -5290,64 +5301,64 @@ msgid "Unable to delete design setting."
msgstr "Impossibile deler configuration de apparentia."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configuration basic del sito"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Sito"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configuration del apparentia"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Apparentia"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Configuration del usator"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Usator"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Configuration del accesso"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configuration del camminos"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Configuration del sessiones"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Modificar aviso del sito"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Configuration del instantaneos"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Le ressource de API require accesso pro lectura e scriptura, ma tu ha "
@@ -5438,25 +5449,22 @@ msgstr "Cancellar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Lectura e scriptura"
+msgstr "lectura-scriptura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Lectura solmente"
+msgstr "lectura solmente"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Accesso \"%2$s\" approbate le %1$s."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Revocar"
@@ -5484,11 +5492,11 @@ msgstr "Notas ubi iste annexo appare"
msgid "Tags for this attachment"
msgstr "Etiquettas pro iste annexo"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Cambio del contrasigno fallite"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Cambio del contrasigno non permittite"
@@ -5570,9 +5578,9 @@ msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
+msgstr "Non poteva remover le usator %1$s del gruppo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5582,14 +5590,14 @@ msgstr "Nomine complete: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Loco: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pagina personal: %s"
@@ -5612,9 +5620,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -6123,8 +6131,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seque ora tu notas in %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Si tu crede que iste conto es usate abusivemente, tu pote blocar lo de tu "
+"lista de subscriptores e reportar lo como spam al administratores del sito a "
+"%s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6150,19 +6168,19 @@ msgstr ""
"Cambia tu adresse de e-mail o optiones de notification a %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nove adresse de e-mail pro publicar in %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6184,30 +6202,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Stato de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Iste numero de telephono attende confirmation."
+msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te ha pulsate"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6235,13 +6253,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nove message private de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6275,13 +6293,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha addite tu nota como favorite"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6320,21 +6338,24 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"Le conversation complete pote esser legite hic:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ha inviate un nota a tu attention"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6360,6 +6381,28 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) ha inviate un nota a tu attention (un '@-responsa') in %2$s.\n"
+"\n"
+"Le nota es hic:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Illo dice:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sTu pote responder hic:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Le lista de tote le @-responsas pro te es hic:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Cordialmente,\n"
+"%2$s\n"
+"\n"
+"P.S. Tu pote disactivar iste notificationes electronic hic: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6374,7 +6417,7 @@ msgstr ""
"altere usatores in conversation. Altere personas pote inviar te messages que "
"solmente tu pote leger."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "de"
@@ -6534,23 +6577,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "a"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in contexto"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetite per"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder a iste nota"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Nota repetite"
@@ -6623,7 +6666,7 @@ msgstr "Tu messages inviate"
msgid "Tags in %s's notices"
msgstr "Etiquettas in le notas de %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Incognite"
@@ -6660,7 +6703,7 @@ msgstr "Media de cata die"
msgid "All groups"
msgstr "Tote le gruppos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Methodo non implementate."
@@ -6684,7 +6727,7 @@ msgstr "In evidentia"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Nulle parametro return-to."
@@ -6705,7 +6748,7 @@ msgstr "Repeter iste nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar le rolo \"%s\" de iste usator"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nulle signule usator definite pro le modo de singule usator."
@@ -6803,6 +6846,55 @@ msgstr "Nube de etiquetta de personas como etiquettate"
msgid "None"
msgstr "Nulle"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"Iste servitor non pote manear le incargamento de apparentias sin supporto de "
+"ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Le file del apparentia manca o le incargamento ha fallite."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Salveguarda del apparentia fallite."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Apparentia invalide: mal structura de directorios."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Le apparentia incargate es troppo voluminose; debe occupar minus de %d bytes "
+"in forma non comprimite."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Archivo de apparentia invalide: manca le file css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Le apparentia contine un nomine de file o dossier invalide. Limita te a "
+"litteras ASCII, digitos, sublineamento, e signo minus."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+"Le apparentia contine un file del typo '.%s', le qual non es permittite."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Error durante le apertura del archivo del apparentia."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Qui scribe le plus"
@@ -6883,56 +6975,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "alcun secundas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "circa un minuta retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "circa un hora retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "circa un die retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "circa un mense retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "circa un anno retro"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 731a94868..c76c4e95f 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:07+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:07+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Samþykkja"
@@ -92,25 +92,25 @@ msgid "Save"
msgstr "Vista"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Ekkert þannig merki."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -123,7 +123,7 @@ msgid "No such user."
msgstr "Enginn svoleiðis notandi."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s og vinirnir, síða %d"
@@ -131,39 +131,39 @@ msgstr "%s og vinirnir, síða %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s og vinirnir"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -171,14 +171,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -186,65 +186,65 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr ""
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Færslur frá %1$s og vinum á %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Þessi aðferð krefst POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Gat ekki uppfært notanda."
@@ -266,7 +266,7 @@ msgstr "Gat ekki vistað persónulega síðu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -325,43 +325,43 @@ msgstr "Bein skilaboð til %s"
msgid "All the direct messages sent to %s"
msgstr "Öll bein skilaboð til %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Enginn texti í skilaboðum!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Móttakandi fannst ekki."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Engin staða fundin með þessu kenni."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Þetta babl er nú þegar í uppáhaldi!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Gat ekki búið til uppáhald."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
#, fuzzy
msgid "That status is not a favorite."
msgstr "Þetta babl er ekki í uppáhaldi!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Gat ekki eytt uppáhaldi."
@@ -397,122 +397,122 @@ msgstr ""
msgid "Could not find target user."
msgstr ""
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ekki tækt stuttnefni."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Heimasíða er ekki gild vefslóð."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ógilt merki: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Gat ekki bætt notandanum %s í hópinn %s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "Hópar %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Hópar sem %s er meðlimur í"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Hópar %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, fuzzy, php-format
msgid "groups on %s"
msgstr "Hópsaðgerðir"
@@ -528,15 +528,15 @@ msgstr "Ótæk stærð."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -600,12 +600,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Aðgangur"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -613,8 +613,8 @@ msgid "Nickname"
msgstr "Stuttnefni"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Lykilorð"
@@ -631,11 +631,11 @@ msgstr "Allt"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Þessi aðferð krefst POST eða DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Þú getur ekki eytt stöðu annars notanda."
@@ -654,25 +654,25 @@ msgstr "Get ekki kveikt á tilkynningum."
msgid "Already repeated that notice."
msgstr "Eyða þessu babli"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr ""
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Engin staða með þessu kenni fannst."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Fannst ekki."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -682,32 +682,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Skráarsnið myndar ekki stutt."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Uppáhaldsbabl frá %s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Almenningsrás %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s færslur frá öllum!"
@@ -722,12 +722,12 @@ msgstr "Svör við %s"
msgid "Repeats of %s"
msgstr "Svör við %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Babl merkt með %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -785,7 +785,7 @@ msgid "Preview"
msgstr "Forsýn"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Eyða"
@@ -828,11 +828,11 @@ msgstr ""
msgid "You already blocked that user."
msgstr "Þú hefur nú þegar lokað á þennan notanda."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Loka á notanda"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -844,7 +844,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -854,7 +854,7 @@ msgstr "Nei"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Opna á þennan notanda"
@@ -864,7 +864,7 @@ msgstr "Opna á þennan notanda"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -873,11 +873,11 @@ msgid "Yes"
msgstr "Já"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Loka á þennan notanda"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
@@ -1009,7 +1009,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -1043,7 +1043,7 @@ msgstr "Eyða þessu babli"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ekki innskráð(ur)."
@@ -1072,7 +1072,7 @@ msgid "Do not delete this notice"
msgstr ""
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -1114,51 +1114,60 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ótæk stærð."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Breyta"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "Bjóða"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Breyta"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
#, fuzzy
msgid "Theme for the site."
msgstr "Skrá þig út af síðunni"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Babl vefsíðunnar"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1166,57 +1175,65 @@ msgid ""
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texti"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1226,7 +1243,7 @@ msgstr ""
msgid "Save"
msgstr "Vista"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1516,7 +1533,7 @@ msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
@@ -1754,13 +1771,13 @@ msgstr "Notandi hefur enga persónulega síðu."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Engin persónuleg síða tilgreind"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Engin persónulega síða með þessu einkenni"
@@ -1895,7 +1912,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Rás %s"
@@ -2320,42 +2337,42 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
msgid "%1$s left group %2$s"
msgstr "%s gekk úr hópnum %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Þú hefur nú þegar skráð þig inn."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Rangt notendanafn eða lykilorð."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
"með þér!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Tapað eða gleymt lykilorð?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2363,11 +2380,15 @@ msgstr ""
"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
"lykilorð áður en þú breytir stillingunum þínum."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Skráðu þig inn með notendanafni og lykilorði"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
@@ -2576,31 +2597,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Babl hefur enga persónulega síðu"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Staða %1$s á %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr ""
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -2711,7 +2732,7 @@ msgid "6 or more characters"
msgstr "6 eða fleiri tákn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Staðfesta"
@@ -2723,11 +2744,11 @@ msgstr "Sama og lykilorðið hér fyrir ofan"
msgid "Change"
msgstr "Breyta"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Lykilorðin passa ekki saman."
@@ -2748,7 +2769,7 @@ msgid "Password saved."
msgstr "Lykilorð vistað."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2963,46 +2984,46 @@ msgstr "Upplýsingar á persónulegri síðu"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt nafn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimasíða"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
"vefsvæði"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Lýstu þér og þínum "
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Lýsing"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Staðsetning"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
@@ -3046,7 +3067,7 @@ msgstr ""
"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
"(best fyrir ómannlega notendur)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
@@ -3295,7 +3316,7 @@ msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
msgid "Password and confirmation do not match."
msgstr "Lykilorð og staðfesting passa ekki saman."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
@@ -3303,80 +3324,102 @@ msgstr "Villa kom upp í stillingu notanda."
msgid "New password successfully saved. You are now logged in."
msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Nýskráning ekki leyfð."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Tölvupóstfang er nú þegar skráð."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ótækt notendanafn eða lykilorð."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eða fleiri tákn. Nauðsynlegt"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Tölvupóstur"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3409,7 +3452,7 @@ msgstr ""
"\n"
"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3499,7 +3542,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
msgid "You already repeated that notice."
msgstr "Þú hefur nú þegar lokað á þennan notanda."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "à sviðsljósinu"
@@ -3570,7 +3613,7 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð."
msgid "User doesn't have this role."
msgstr "Notandi með enga persónulega síðu sem passar við"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Tölfræði"
@@ -3586,7 +3629,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3632,7 +3675,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3645,7 +3688,7 @@ msgid "Organization"
msgstr "Uppröðun"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Lýsing"
@@ -4250,7 +4293,7 @@ msgstr "Enginn lykill sleginn inn"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4611,7 +4654,7 @@ msgstr ""
"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
"áskrifandi að babli, smelltu þá á \"Hætta við\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4739,29 +4782,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Færslur frá %1$s á %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Tölfræði"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4769,7 +4812,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4777,40 +4820,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "Persónulegt"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4854,48 +4897,48 @@ msgid "Could not update message with new URI."
msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Gat ekki vistað babl. Óþekktur notandi."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
"mínútur."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
#. 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:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5002,26 +5045,26 @@ msgid "Untitled page"
msgstr "Ónafngreind síða"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Persónulegt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
@@ -5030,107 +5073,107 @@ msgstr ""
"persónulegu síðunni þinni"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Tengjast"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Stikl aðalsíðu"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Stjórnandi"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Bjóða"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Útskráning"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Búa til aðgang"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Nýskrá"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Innskráning"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hjálp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5138,71 +5181,71 @@ msgstr "Leita"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Babl vefsíðunnar"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Staðbundin sýn"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Babl síðunnar"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Hjálp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Um"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Spurt og svarað"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Friðhelgi"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Frumþula"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5212,13 +5255,13 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er örbloggsþjónusta."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5230,55 +5273,55 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Ãður"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5286,11 +5329,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5325,74 +5368,74 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Staðfesting tölvupóstfangs"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Bjóða"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "SMS staðfesting"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Persónulegt"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "SMS staðfesting"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Notandi"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "SMS staðfesting"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "SMS staðfesting"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "SMS staðfesting"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Babl vefsíðunnar"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS staðfesting"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5527,12 +5570,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Lykilorðabreyting"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Lykilorðabreyting"
@@ -5625,14 +5668,14 @@ msgstr "Fullt nafn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Staðsetning: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Heimasíða: %s"
@@ -6123,8 +6166,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s er að hlusta á bablið þitt á %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6140,7 +6190,7 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6148,13 +6198,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nýtt tölvupóstfang til að senda á %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6176,30 +6226,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Staða %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS staðfesting"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ýtti við þér"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6216,13 +6266,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ný persónuleg skilaboð frá %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6242,13 +6292,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s heldur upp á babl frá þér"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6270,7 +6320,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6278,13 +6328,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6321,7 +6371,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr "frá"
@@ -6481,24 +6531,24 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "à sviðsljósinu"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svara þessu babli"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Babl sent inn"
@@ -6573,7 +6623,7 @@ msgstr "Skilaboð sem þú hefur sent"
msgid "Tags in %s's notices"
msgstr "Merki í babli %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "Óþekkt aðgerð"
@@ -6611,7 +6661,7 @@ msgstr ""
msgid "All groups"
msgstr "Allir hópar"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6635,7 +6685,7 @@ msgstr "à sviðsljósinu"
msgid "Popular"
msgstr "Vinsælt"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Ekkert einkenni gefið upp."
@@ -6659,7 +6709,7 @@ msgstr "Svara þessu babli"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6761,6 +6811,51 @@ msgstr ""
msgid "None"
msgstr "Ekkert"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Kerfisvilla kom upp við upphal skráar."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Mistókst að uppfæra mynd"
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Aðalbablararnir"
@@ -6844,56 +6939,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index b3aa969ae..1b6b39f03 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Italian
#
+# Author@translatewiki.net: HalphaZ
# Author@translatewiki.net: Milocasagrande
# Author@translatewiki.net: Nemo bis
# --
@@ -9,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:10+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:12+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Accesso"
@@ -86,24 +87,24 @@ msgid "Save"
msgstr "Salva"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Pagina inesistente."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -116,7 +117,7 @@ msgid "No such user."
msgstr "Utente inesistente."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amici, pagina %2$d"
@@ -124,33 +125,33 @@ msgstr "%1$s e amici, pagina %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s e amici"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed degli amici di %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed degli amici di %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed degli amici di %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -158,7 +159,7 @@ msgstr ""
"Questa è l'attività di %s e i suoi amici, ma nessuno ha ancora scritto "
"qualche cosa."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -168,7 +169,7 @@ msgstr ""
"scrivi un messaggio."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -178,7 +179,7 @@ msgstr ""
"qualche cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%3"
"$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,58 +189,58 @@ msgstr ""
"un messaggio alla sua attenzione."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Tu e i tuoi amici"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Messaggi da %1$s e amici su %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Metodo delle API non trovato."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Questo metodo richiede POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -247,7 +248,7 @@ msgstr ""
"È necessario specificare un parametro chiamato \"device\" con un valore tra: "
"\"sms\", \"im\" o \"none\"."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Impossibile aggiornare l'utente."
@@ -267,7 +268,7 @@ msgstr "Impossibile salvare il profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -326,41 +327,41 @@ msgstr "Messaggi diretti a %s"
msgid "All the direct messages sent to %s"
msgstr "Tutti i messaggi diretti inviati a %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Nessun testo nel messaggio!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Destinatario non trovato."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Nessuno messaggio trovato con quel ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Questo messaggio è già un preferito."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Impossibile creare un preferito."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Questo messaggio non è un preferito."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Impossibile eliminare un preferito."
@@ -393,121 +394,121 @@ msgstr "Impossibile determinare l'utente sorgente."
msgid "Could not find target user."
msgstr "Impossibile trovare l'utente destinazione."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
"spazi."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Soprannome già in uso. Prova con un altro."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Non è un soprannome valido."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "L'indirizzo della pagina web non è valido."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nome troppo lungo (max 255 caratteri)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "La descrizione è troppo lunga (max %d caratteri)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Ubicazione troppo lunga (max 255 caratteri)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Troppi alias! Massimo %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias non valido: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "L'alias non può essere lo stesso del soprannome."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Gruppo non trovato."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Fai già parte di quel gruppo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Non fai parte di questo gruppo."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Gruppi di %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Gruppi del sito %1$s a cui %2$s è iscritto."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Gruppi di %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "Gruppi su %s"
@@ -522,15 +523,15 @@ msgstr "Token non valido."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -597,12 +598,12 @@ msgstr ""
"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +611,8 @@ msgid "Nickname"
msgstr "Soprannome"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Password"
@@ -627,11 +628,11 @@ msgstr "Consenti"
msgid "Allow or deny access to your account information."
msgstr "Consenti o nega l'accesso alle informazioni del tuo account."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Questo metodo richiede POST o DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Non puoi eliminare il messaggio di un altro utente."
@@ -648,25 +649,25 @@ msgstr "Non puoi ripetere un tuo messaggio."
msgid "Already repeated that notice."
msgstr "Hai già ripetuto quel messaggio."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Messaggio eliminato."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Nessuno stato trovato con quel ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Troppo lungo. Lunghezza massima %d caratteri."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trovato."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -676,32 +677,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Formato non supportato."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Preferiti da %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Messaggi che citano %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Attività pubblica di %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Aggiornamenti di %s da tutti!"
@@ -716,12 +717,12 @@ msgstr "Ripetuto a %s"
msgid "Repeats of %s"
msgstr "Ripetizioni di %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Messaggi etichettati con %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Messaggi etichettati con %1$s su %2$s!"
@@ -779,7 +780,7 @@ msgid "Preview"
msgstr "Anteprima"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Elimina"
@@ -819,11 +820,11 @@ msgstr "Immagine eliminata."
msgid "You already blocked that user."
msgstr "Hai già bloccato quell'utente."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocca utente"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -838,17 +839,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloccare questo utente"
@@ -857,20 +857,19 @@ msgstr "Non bloccare questo utente"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sì"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
@@ -997,7 +996,7 @@ msgstr "Questa applicazione non è di tua proprietà."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1030,7 +1029,7 @@ msgstr "Elimina l'applicazione"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Accesso non effettuato."
@@ -1061,7 +1060,7 @@ msgid "Do not delete this notice"
msgstr "Non eliminare il messaggio"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -1101,45 +1100,53 @@ msgstr "Aspetto"
msgid "Design settings for this StatusNet site."
msgstr "Impostazioni dell'aspetto per questo sito di StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL del logo non valido."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Tema non disponibile: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Modifica logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo del sito"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Modifica tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Tema del sito"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema per questo sito."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Tema personalizzato"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Modifica l'immagine di sfondo"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Sfondo"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1149,57 +1156,65 @@ msgstr ""
"file è di %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Abilita o disabilita l'immagine di sfondo."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Affianca l'immagine di sfondo"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifica colori"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Contenuto"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra laterale"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Testo"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Collegamenti"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avanzate"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "CSS personalizzato"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usa predefiniti"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Ripristina i valori predefiniti"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reimposta i valori predefiniti"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1209,7 +1224,7 @@ msgstr "Reimposta i valori predefiniti"
msgid "Save"
msgstr "Salva"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Salva aspetto"
@@ -1362,7 +1377,6 @@ msgstr "Indirizzo email attualmente confermato."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Rimuovi"
@@ -1396,7 +1410,6 @@ msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Aggiungi"
@@ -1424,16 +1437,14 @@ msgstr ""
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nuovo"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferenze"
+msgstr "Preferenze dell'email"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1473,9 +1484,8 @@ msgstr "Pubblica un MicroID per il mio indirizzo email"
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Preferenze dell'aspetto salvate."
+msgstr "Preferenze dell'email salvate."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1488,7 +1498,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare quell'indirizzo email"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
@@ -1531,15 +1541,13 @@ msgstr "Nessuna conferma da annullare."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Quello è l'indirizzo di messaggistica sbagliato."
+msgstr "Quello è l'indirizzo email sbagliato."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Conferma annullata."
+msgstr "Conferma dell'email annullata."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1549,9 +1557,8 @@ msgstr "Quello non è il tuo indirizzo email."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "L'indirizzo è stato rimosso."
+msgstr "L'indirizzo email è stato rimosso."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1719,13 +1726,13 @@ msgstr "L'utente ricopre già questo ruolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nessun profilo specificato."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Nessun profilo con quel ID."
@@ -1866,7 +1873,7 @@ msgstr "Rende questo utente un amministratore"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Attività di %s"
@@ -2013,9 +2020,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferenze"
+msgstr "Preferenze messaggistica"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2085,15 +2091,13 @@ msgstr "Quello è l'indirizzo di messaggistica sbagliato."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Impossibile eliminare l'email di conferma."
+msgstr "Impossibile eliminare la conferma della messaggistica."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Conferma annullata."
+msgstr "Conferma della messaggistica annullata."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2103,9 +2107,8 @@ msgstr "Quello non è il tuo ID di Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "L'indirizzo è stato rimosso."
+msgstr "L'indirizzo di messaggistica è stato rimosso."
#: actions/inbox.php:59
#, php-format
@@ -2296,39 +2299,39 @@ msgstr "Non fai parte di quel gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Accesso già effettuato."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome utente o password non corretto."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Password persa o dimenticata?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2336,14 +2339,16 @@ msgstr ""
"Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e "
"la tua password prima di modificare le impostazioni."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Accedi con nome utente e password."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]"
-"(%%action.register%%) un nuovo account."
+"Non hai ancora un nome utente? [Crea](%%action.register%%) un nuovo account."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2545,30 +2550,30 @@ msgstr ""
"Gli sviluppatori possono modificare le impostazioni di registrazione per le "
"loro applicazioni "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Il messaggio non ha un profilo."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stato di %1$s su %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Tipo di contenuto %s non supportato."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Solo URL %s attraverso HTTP semplice."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2598,7 +2603,7 @@ msgstr "Accorcia gli URL con"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr "Servizio di autoriduzione da usare."
+msgstr "Servizio di autoriduzione da usare"
#: actions/othersettings.php:122
msgid "View profile designs"
@@ -2606,7 +2611,7 @@ msgstr "Visualizza aspetto"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr "Mostra o nasconde gli aspetti del profilo."
+msgstr "Mostra o nasconde gli aspetti del profilo"
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2673,7 +2678,7 @@ msgid "6 or more characters"
msgstr "6 o più caratteri"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Conferma"
@@ -2685,11 +2690,11 @@ msgstr "Stessa password di sopra"
msgid "Change"
msgstr "Modifica"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "La password deve essere di 6 o più caratteri."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Le password non corrispondono."
@@ -2710,7 +2715,7 @@ msgid "Password saved."
msgstr "Password salvata."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Percorsi"
@@ -2916,43 +2921,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina web"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL della tua pagina web, blog o profilo su un altro sito"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descriviti assieme ai tuoi interessi in %d caratteri"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descrivi te e i tuoi interessi"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicazione"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dove ti trovi, tipo \"città, regione, stato\""
@@ -2995,7 +3000,7 @@ msgstr ""
"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
"umani)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max %d caratteri)."
@@ -3254,7 +3259,7 @@ msgstr "La password deve essere lunga almeno 6 caratteri."
msgid "Password and confirmation do not match."
msgstr "La password e la conferma non corrispondono."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
@@ -3262,39 +3267,39 @@ msgstr "Errore nell'impostare l'utente."
msgid "New password successfully saved. You are now logged in."
msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Solo le persone invitate possono registrarsi."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Codice di invito non valido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrati"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrazione non consentita."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Non puoi registrarti se non accetti la licenza."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Indirizzo email già esistente."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nome utente o password non valido."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3303,34 +3308,57 @@ msgstr ""
"successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
"colleghi. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o più caratteri; richiesta"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Stessa password di sopra; richiesta"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usata solo per aggiornamenti, annunci e recupero password"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "I miei testi e i miei file sono copyright di %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "I miei testi e file restano sotto il mio diretto copyright."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Tutti i diritti riservati."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3340,7 +3368,7 @@ msgstr ""
"dati personali: password, indirizzo email, indirizzo messaggistica "
"istantanea e numero di telefono."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3374,7 +3402,7 @@ msgstr ""
"Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
"servizio."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3457,7 +3485,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
msgid "You already repeated that notice."
msgstr "Hai già ripetuto quel messaggio."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Ripetuti"
@@ -3531,7 +3559,7 @@ msgstr "Non puoi revocare i ruoli degli utenti su questo sito."
msgid "User doesn't have this role."
msgstr "L'utente non ricopre questo ruolo."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3545,7 +3573,7 @@ msgstr "L'utente è già nella \"sandbox\"."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessioni"
@@ -3588,7 +3616,7 @@ msgid "Icon"
msgstr "Icona"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nome"
@@ -3599,7 +3627,7 @@ msgid "Organization"
msgstr "Organizzazione"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Descrizione"
@@ -4081,9 +4109,8 @@ msgstr "Il servizio SMS non è disponibile."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Indirizzo di messaggistica istantanea"
+msgstr "Indirizzo SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4107,7 +4134,6 @@ msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Conferma"
@@ -4124,9 +4150,8 @@ msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferenze"
+msgstr "Preferenze dell'SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4139,9 +4164,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferenze salvate."
+msgstr "Preferenze dell'SMS salvate."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4180,9 +4204,8 @@ msgstr "Quello è il numero di conferma errato."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Conferma annullata."
+msgstr "Conferma dell'SMS annullata."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4192,9 +4215,8 @@ msgstr "Quello non è il tuo numero di telefono."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Numero di telefono per SMS"
+msgstr "Il numero di telefono per SMS è stato rimosso."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4224,7 +4246,7 @@ msgstr "Nessun codice inserito"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Snapshot"
@@ -4579,7 +4601,7 @@ 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\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licenza"
@@ -4708,18 +4730,18 @@ msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti."
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Messaggi da %1$s su %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4728,11 +4750,11 @@ msgstr ""
"Questo sito esegue il software %1$s versione %2$s, Copyright 2008-2010 "
"StatusNet, Inc. e collaboratori."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Collaboratori"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4744,7 +4766,7 @@ msgstr ""
"Software Foundation, versione 3 o (a scelta) una qualsiasi versione "
"successiva. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4756,7 +4778,7 @@ msgstr ""
"o di UTILIZZABILITÀ PER UN PARTICOLARE SCOPO. Per maggiori informazioni "
"consultare la GNU Affero General Public License. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4765,20 +4787,20 @@ msgstr ""
"Una copia della GNU Affero General Plublic License dovrebbe essere "
"disponibile assieme a questo programma. Se così non fosse, consultare %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Plugin"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Versione"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autori"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4787,13 +4809,13 @@ msgstr ""
"Nessun file può superare %d byte e il file inviato era di %d byte. Prova a "
"caricarne una versione più piccola."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Un file di questa dimensione supererebbe la tua quota utente di %d byte."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4833,27 +4855,27 @@ msgid "Could not update message with new URI."
msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Errore del database nell'inserire un hashtag: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problema nel salvare il messaggio. Troppo lungo."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
"qualche minuto."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4861,21 +4883,21 @@ msgstr ""
"Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di "
"nuovo tra qualche minuto."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4976,188 +4998,188 @@ msgid "Untitled page"
msgstr "Pagina senza nome"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personale"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Connetti"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Amministra"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Invita"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Esci"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un account"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrati"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Accedi"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Aiuto"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Cerca"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Messaggio del sito"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Viste locali"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Pagina messaggio"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Aiuto"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Informazioni"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Sorgenti"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Badge"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5167,13 +5189,13 @@ msgstr ""
"(%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** è un servizio di microblog."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5185,34 +5207,34 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
"riservati."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5220,24 +5242,24 @@ msgstr ""
"licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Precedenti"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
@@ -5245,11 +5267,11 @@ msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
msgid "Can't handle remote content yet."
msgstr "Impossibile gestire contenuti remoti."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Impossibile gestire contenuti XML incorporati."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Impossibile gestire contenuti Base64."
@@ -5280,64 +5302,64 @@ msgid "Unable to delete design setting."
msgstr "Impossibile eliminare le impostazioni dell'aspetto."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configurazione di base"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Sito"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configurazione aspetto"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Aspetto"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Configurazione utente"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Utente"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Configurazione di accesso"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configurazione percorsi"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Configurazione sessioni"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Modifica messaggio del sito"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Configurazione snapshot"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo "
@@ -5470,11 +5492,11 @@ msgstr "Messaggi in cui appare questo allegato"
msgid "Tags for this attachment"
msgstr "Etichette per questo allegato"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Modifica della password non riuscita"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "La modifica della password non è permessa"
@@ -5556,9 +5578,9 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
+msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5568,14 +5590,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Posizione: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pagina web: %s"
@@ -5598,9 +5620,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -6113,8 +6135,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Se credi che questo account non sia usato correttamente, puoi bloccarlo "
+"dall'elenco dei tuoi abbonati e segnalarlo come spam all'amministratore del "
+"sito presso %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6140,19 +6172,19 @@ msgstr ""
"Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografia: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nuovo indirizzo email per inviare messaggi a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6174,31 +6206,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "stato di %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Conferma SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s: conferma che questo numero di telefono sia tuo utilizzando questo codice:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ti ha richiamato"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6226,13 +6258,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuovo messaggio privato da %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6266,13 +6298,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6311,7 +6343,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6322,13 +6354,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ti ha inviato un messaggio"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6354,6 +6386,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-risposta\") su %2"
+"$s.\n"
+"\n"
+"Il messaggio è qui:\n"
+"\n"
+"%3$s\n"
+"\n"
+"E dice:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sPuoi rispondere qui:\n"
+"\n"
+"%6$s\n"
+"\n"
+"L'elenco di tutte le tue @-risposte si trova qui:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Cordiali saluti,\n"
+"%2$s\n"
+"\n"
+"P.S: puoi disabilitare le notifiche via email qui: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6368,7 +6423,7 @@ msgstr ""
"iniziare una conversazione con altri utenti. Altre persone possono mandare "
"messaggi riservati solamente a te."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "via"
@@ -6527,23 +6582,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "presso"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in una discussione"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Ripetuto da"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Rispondi a questo messaggio"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Rispondi"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Messaggio ripetuto"
@@ -6616,7 +6671,7 @@ msgstr "I tuoi messaggi inviati"
msgid "Tags in %s's notices"
msgstr "Etichette nei messaggi di %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Sconosciuto"
@@ -6653,7 +6708,7 @@ msgstr "Media giornaliera"
msgid "All groups"
msgstr "Tutti i gruppi"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Metodo non implementato"
@@ -6677,7 +6732,7 @@ msgstr "In evidenza"
msgid "Popular"
msgstr "Famosi"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Nessun argomento return-to."
@@ -6698,7 +6753,7 @@ msgstr "Ripeti questo messaggio"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca il ruolo \"%s\" a questo utente"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nessun utente singolo definito per la modalità single-user."
@@ -6796,6 +6851,52 @@ msgstr "Insieme delle etichette delle persone come etichettate"
msgid "None"
msgstr "Nessuno"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"Questo server non è in grado di gestire caricamenti senza il supporto ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Tema caricato mancante o caricamento non riuscito."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Salvataggio del tema non riuscito."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Tema non valido: struttura directory non corretta."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Il tema caricato è troppo grande, deve essere meno di %d byte non compresso."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "File di tema non valido: manca il file css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Il tema contiene file non o nomi di cartelle non validi. Utilizzare "
+"solamente caratteri ASCII, numeri, il trattino basso e il segno meno."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "Il tema contiene file di tipo \".%s\" che non sono supportati."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Errore nell'aprire il file del tema."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Chi scrive più messaggi"
@@ -6876,56 +6977,56 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "pochi secondi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "circa un minuto fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "circa un'ora fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "circa un giorno fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "circa un mese fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index d70e8262d..e0e1ef021 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Japanese
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Fryed-peach
# Author@translatewiki.net: Sonoda
# Author@translatewiki.net: Whym
@@ -10,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:13+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:16+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +24,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "アクセス"
@@ -87,25 +88,25 @@ msgid "Save"
msgstr "ä¿å­˜"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "ãã®ã‚ˆã†ãªãƒšãƒ¼ã‚¸ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -118,7 +119,7 @@ msgid "No such user."
msgstr "ãã®ã‚ˆã†ãªãƒ¦ãƒ¼ã‚¶ã¯ã„ã¾ã›ã‚“。"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s ã¨å‹äººã€ãƒšãƒ¼ã‚¸ %2$d"
@@ -126,39 +127,39 @@ msgstr "%1$s ã¨å‹äººã€ãƒšãƒ¼ã‚¸ %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s ã¨å‹äºº"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "%s ã®å‹äººã®ãƒ•ã‚£ãƒ¼ãƒ‰ (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "%s ã®å‹äººã®ãƒ•ã‚£ãƒ¼ãƒ‰ (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%s ã®å‹äººã®ãƒ•ã‚£ãƒ¼ãƒ‰ (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "ã“れ㯠%s ã¨å‹äººã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã™ã€‚ã¾ã èª°ã‚‚投稿ã—ã¦ã„ã¾ã›ã‚“。"
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -168,7 +169,7 @@ msgstr ""
"ã—ã¦ã¿ãŸã‚Šã€ä½•ã‹æŠ•ç¨¿ã—ã¦ã¿ã¾ã—ょã†ã€‚"
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -177,7 +178,7 @@ msgstr ""
"プロフィールã‹ã‚‰ [%1$s ã•ã‚“ã«åˆå›³](../%2$s) ã—ãŸã‚Šã€[知らã›ãŸã„ã“ã¨ã«ã¤ã„ã¦æŠ•"
"稿](%%%%action.newnotice%%%%?status_textarea=%3$s) ã—ãŸã‚Šã§ãã¾ã™ã€‚"
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,58 +188,58 @@ msgstr ""
"ã›ã‚’é€ã£ã¦ã¿ã¾ã›ã‚“ã‹ã€‚"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "ã‚ãªãŸã¨å‹äºº"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ãŒå¿…è¦ã§ã™ã€‚"
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
@@ -247,7 +248,7 @@ msgstr ""
"「deviceã€ã¨ã„ã†åå‰ã®å¼•æ•°ã‚’ã€æ¬¡ã®ä¸­ã‹ã‚‰å€¤ã‚’é¸ã‚“ã§ã€æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™: "
"sms, im, none"
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "ユーザを更新ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
@@ -267,7 +268,7 @@ msgstr "プロフィールをä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -326,41 +327,41 @@ msgstr "%s ã¸ã®ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
msgid "All the direct messages sent to %s"
msgstr "%s ã¸é€ã£ãŸå…¨ã¦ã®ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "メッセージã®æœ¬æ–‡ãŒã‚ã‚Šã¾ã›ã‚“ï¼"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "é•·ã™ãŽã¾ã™ã€‚メッセージã¯æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚"
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "å—ã‘å–り手ã®ãƒ¦ãƒ¼ã‚¶ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "å‹äººã§ãªã„ユーザã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "ãã®ï¼©ï¼¤ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "ã“ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã™ã§ã«ãŠæ°—ã«å…¥ã‚Šã§ã™ã€‚"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’作æˆã§ãã¾ã›ã‚“。"
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "ãã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ãŠæ°—ã«å…¥ã‚Šã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’å–り消ã™ã“ã¨ãŒã§ãã¾ã›ã‚“。"
@@ -394,122 +395,122 @@ msgstr "ソースユーザーを決定ã§ãã¾ã›ã‚“。"
msgid "Could not find target user."
msgstr "ターゲットユーザーを見ã¤ã‘られã¾ã›ã‚“。"
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"ニックãƒãƒ¼ãƒ ã«ã¯ã€å°æ–‡å­—アルファベットã¨æ•°å­—ã®ã¿ä½¿ç”¨ã§ãã¾ã™ã€‚スペースã¯ä½¿ç”¨"
"ã§ãã¾ã›ã‚“。"
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "ãã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¯æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ä»–ã®ã‚‚ã®ã‚’試ã—ã¦ã¿ã¦ä¸‹ã•ã„。"
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "有効ãªãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "ホームページã®URLãŒä¸é©åˆ‡ã§ã™ã€‚"
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "フルãƒãƒ¼ãƒ ãŒé•·ã™ãŽã¾ã™ã€‚(255å­—ã¾ã§ï¼‰"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "記述ãŒé•·ã™ãŽã¾ã™ã€‚(最長140字)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "場所ãŒé•·ã™ãŽã¾ã™ã€‚(255å­—ã¾ã§ï¼‰"
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "別åãŒå¤šã™ãŽã¾ã™! 最大 %d。"
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "ä¸æ­£ãªåˆ¥å: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "別å \"%s\" ã¯æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ä»–ã®ã‚‚ã®ã‚’試ã—ã¦ã¿ã¦ä¸‹ã•ã„。"
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "別åã¯ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¨åŒã˜ã§ã¯ã„ã‘ã¾ã›ã‚“。"
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "グループãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "管ç†è€…ã«ã‚ˆã£ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ユーザ %1$s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %2$s ã«å‚加ã§ãã¾ã›ã‚“。"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "ユーザ %1$s をグループ %2$s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s ã®ã‚°ãƒ«ãƒ¼ãƒ—"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "グループ %s ã¯ãƒ¡ãƒ³ãƒãƒ¼"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s グループ"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "%s 上ã®ã‚°ãƒ«ãƒ¼ãƒ—"
@@ -524,15 +525,15 @@ msgstr "ä¸æ­£ãªãƒˆãƒ¼ã‚¯ãƒ³ã€‚"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -595,12 +596,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "アカウント"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -608,8 +609,8 @@ msgid "Nickname"
msgstr "ニックãƒãƒ¼ãƒ "
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "パスワード"
@@ -625,11 +626,11 @@ msgstr "許å¯"
msgid "Allow or deny access to your account information."
msgstr "アカウント情報ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã™ã‚‹ã‹ã€ã¾ãŸã¯æ‹’絶ã—ã¦ãã ã•ã„。"
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ã‹ DELETE ãŒå¿…è¦ã§ã™ã€‚"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "ä»–ã®ãƒ¦ãƒ¼ã‚¶ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’消ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
@@ -646,25 +647,25 @@ msgstr "ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã›ã¾ã›ã‚“。"
msgid "Already repeated that notice."
msgstr "ã™ã§ã«ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¦ã„ã¾ã™ã€‚"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "ステータスを削除ã—ã¾ã—ãŸã€‚"
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "ãã®ï¼©ï¼¤ã§ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "é•·ã™ãŽã¾ã™ã€‚ã¤ã¶ã‚„ãã¯æœ€å¤§ 140 å­—ã¾ã§ã§ã™ã€‚"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "ã¤ã¶ã‚„ã㯠URL ã‚’å«ã‚ã¦æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚"
@@ -673,32 +674,32 @@ msgstr "ã¤ã¶ã‚„ã㯠URL ã‚’å«ã‚ã¦æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚"
msgid "Unsupported format."
msgstr "サãƒãƒ¼ãƒˆå¤–ã®å½¢å¼ã§ã™ã€‚"
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / %2$s ã‹ã‚‰ã®ãŠæ°—ã«å…¥ã‚Š"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s 㯠%2$s ã§ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°ã—ã¾ã—㟠/ %2$s。"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / %2$s ã«ã¤ã„ã¦æ›´æ–°"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%2$s ã‹ã‚‰ã‚¢ãƒƒãƒ—デートã«ç­”ãˆã‚‹ %1$s アップデート"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s ã®ãƒ‘ブリックタイムライン"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "皆ã‹ã‚‰ã® %s アップデート!"
@@ -713,12 +714,12 @@ msgstr "%s ã¸ã®è¿”ä¿¡"
msgid "Repeats of %s"
msgstr "%s ã®è¿”ä¿¡"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "%s ã¨ã‚¿ã‚°ä»˜ã‘ã•ã‚ŒãŸã¤ã¶ã‚„ã"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s ã« %1$s ã«ã‚ˆã‚‹æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
@@ -775,7 +776,7 @@ msgid "Preview"
msgstr "プレビュー"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "削除"
@@ -816,11 +817,11 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"
msgid "You already blocked that user."
msgstr "ãã®ãƒ¦ãƒ¼ã‚¶ã¯ã™ã§ã«ãƒ–ロック済ã¿ã§ã™ã€‚"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "ユーザをブロック"
-#: actions/block.php:130
+#: actions/block.php:138
#, fuzzy
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
@@ -836,7 +837,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -846,7 +847,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブロックã™ã‚‹"
@@ -855,7 +856,7 @@ msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブロックã™ã‚‹"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -864,11 +865,11 @@ msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロックã™ã‚‹"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ブロック情報ã®ä¿å­˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
@@ -995,7 +996,7 @@ msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ã‚ªãƒ¼ãƒŠãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚"
@@ -1029,7 +1030,7 @@ msgstr "ã“ã®ã‚¢ãƒ—リケーションを削除"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "ログインã—ã¦ã„ã¾ã›ã‚“。"
@@ -1060,7 +1061,7 @@ msgid "Do not delete this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãを削除ã§ãã¾ã›ã‚“。"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãを削除"
@@ -1100,45 +1101,54 @@ msgstr "デザイン"
msgid "Design settings for this StatusNet site."
msgstr "ã“ã® StatusNet サイトã®ãƒ‡ã‚¶ã‚¤ãƒ³è¨­å®šã€‚"
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "ä¸æ­£ãªãƒ­ã‚´ URL"
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "テーマãŒåˆ©ç”¨ã§ãã¾ã›ã‚“: %s"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "ロゴã®å¤‰æ›´"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "サイトロゴ"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "テーマ変更"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "サイトテーマ"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "サイトã®ãƒ†ãƒ¼ãƒž"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "サイトテーマ"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã‚¤ãƒ¡ãƒ¼ã‚¸ã®å¤‰æ›´"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1148,57 +1158,65 @@ msgstr ""
"イズ㯠%1$s。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "オン"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "オフ"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã‚¤ãƒ¡ãƒ¼ã‚¸ã®ã‚ªãƒ³ã¾ãŸã¯ã‚ªãƒ•ã€‚"
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "タイルãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã‚¤ãƒ¡ãƒ¼ã‚¸"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "色ã®å¤‰æ›´"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "サイドãƒãƒ¼"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "テキスト"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "リンク"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "デフォルトを使用"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "デフォルトデザインã«æˆ»ã™ã€‚"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "デフォルトã¸ãƒªã‚»ãƒƒãƒˆã™ã‚‹"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1208,7 +1226,7 @@ msgstr "デフォルトã¸ãƒªã‚»ãƒƒãƒˆã™ã‚‹"
msgid "Save"
msgstr "ä¿å­˜"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "デザインã®ä¿å­˜"
@@ -1487,7 +1505,7 @@ msgid "Cannot normalize that email address"
msgstr "ãã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æ­£è¦åŒ–ã§ãã¾ã›ã‚“"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "有効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -1723,13 +1741,13 @@ msgstr "ユーザã¯æ—¢ã«é»™ã£ã¦ã„ã¾ã™ã€‚"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "プロファイル記述ãŒã‚ã‚Šã¾ã›ã‚“。"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "ãã®ï¼©ï¼¤ã®ãƒ—ロファイルãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -1869,7 +1887,7 @@ msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’管ç†è€…ã«ã™ã‚‹"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s ã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³"
@@ -2300,39 +2318,39 @@ msgstr "ã‚ãªãŸã¯ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
msgid "%1$s left group %2$s"
msgstr "%1$s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %2$s ã«æ®‹ã‚Šã¾ã—ãŸã€‚"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "æ—¢ã«ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™ã€‚"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "ユーザåã¾ãŸã¯ãƒ‘スワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "ユーザ設定エラー。 ã‚ãªãŸã¯ãŸã¶ã‚“承èªã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ログイン状態をä¿æŒ"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "以é™ã¯è‡ªå‹•çš„ã«ãƒ­ã‚°ã‚¤ãƒ³ã™ã‚‹ã€‚共用コンピューターã§ã¯é¿ã‘ã¾ã—ょã†ï¼"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "パスワードを紛失ã€å¿˜ã‚ŒãŸï¼Ÿ"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2340,11 +2358,15 @@ msgstr ""
"セキュリティー上ã®ç†ç”±ã«ã‚ˆã‚Šã€è¨­å®šã‚’変更ã™ã‚‹å‰ã«ãƒ¦ãƒ¼ã‚¶åã¨ãƒ‘スワードを入力ã—"
"ã¦ä¸‹ã•ã„。"
-#: actions/login.php:270
-#, php-format
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ユーザåã¨ãƒ‘スワードã§ãƒ­ã‚°ã‚¤ãƒ³"
+
+#: actions/login.php:295
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"ユーザåã¨ãƒ‘スワードã§ã€ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。 ã¾ã ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã›ã‚“"
"ã‹? æ–°ã—ã„アカウントを [登録](%%action.register%%)。"
@@ -2549,31 +2571,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr "開発者ã¯å½¼ã‚‰ã®ã‚¢ãƒ—リケーションã®ãŸã‚ã«ç™»éŒ²è¨­å®šã‚’編集ã§ãã¾ã™ "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "ã¤ã¶ã‚„ãã«ã¯ãƒ—ロファイルã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
-msgstr "%2$s ã«ãŠã‘ã‚‹ %1$ ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹"
+msgstr "%2$s ã«ãŠã‘ã‚‹ %1$s ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "内容種別 "
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„データ形å¼ã€‚"
@@ -2678,7 +2700,7 @@ msgid "6 or more characters"
msgstr "6文字以上"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "パスワード確èª"
@@ -2690,11 +2712,11 @@ msgstr "上ã¨åŒã˜ãƒ‘スワード"
msgid "Change"
msgstr "変更"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "パスワードã¯6文字以上ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。"
@@ -2715,7 +2737,7 @@ msgid "Password saved."
msgstr "パスワードãŒä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "パス"
@@ -2920,43 +2942,43 @@ msgstr "プロファイル情報"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64文字ã®ã€å°æ–‡å­—アルファベットã‹æ•°å­—ã§ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚„å¥èª­ç‚¹ã¯é™¤ã"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "フルãƒãƒ¼ãƒ "
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ホームページ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ホームページã€ãƒ–ログã€ãƒ—ロファイルã€ãã®ä»–サイト㮠URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "%d字以内ã§è‡ªåˆ†è‡ªèº«ã¨è‡ªåˆ†ã®èˆˆå‘³ã«ã¤ã„ã¦æ›¸ã„ã¦ãã ã•ã„"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "自分自身ã¨è‡ªåˆ†ã®èˆˆå‘³ã«ã¤ã„ã¦æ›¸ã„ã¦ãã ã•ã„"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自己紹介"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "場所"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "自分ã®ã„る場所。例:「都市, 都é“府県 (ã¾ãŸã¯åœ°åŸŸ), 国ã€"
@@ -2998,7 +3020,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自分をフォローã—ã¦ã„る者を自動的ã«ãƒ•ã‚©ãƒ­ãƒ¼ã™ã‚‹ (BOTã«æœ€é©)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介ãŒé•·ã™ãŽã¾ã™ (最長140文字)。"
@@ -3259,7 +3281,7 @@ msgstr "パスワードã¯6字以上ã§ãªã‘ã‚Œã°ã„ã‘ã¾ã›ã‚“。"
msgid "Password and confirmation do not match."
msgstr "パスワードã¨ç¢ºèªãŒä¸€è‡´ã—ã¾ã›ã‚“。"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ユーザ設定エラー"
@@ -3267,39 +3289,39 @@ msgstr "ユーザ設定エラー"
msgid "New password successfully saved. You are now logged in."
msgstr "æ–°ã—ã„パスワードã®ä¿å­˜ã«æˆåŠŸã—ã¾ã—ãŸã€‚ログインã—ã¦ã„ã¾ã™ã€‚"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "ã™ã¿ã¾ã›ã‚“ã€æ‹›å¾…ã•ã‚ŒãŸäººã€…ã ã‘ãŒç™»éŒ²ã§ãã¾ã™ã€‚"
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "ã™ã¿ã¾ã›ã‚“ã€ä¸æ­£ãªæ‹›å¾…コード。"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "登録æˆåŠŸ"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "登録ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "ライセンスã«åŒæ„é ‚ã‘ãªã„å ´åˆã¯ç™»éŒ²ã§ãã¾ã›ã‚“。"
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "メールアドレスãŒæ—¢ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "ä¸æ­£ãªãƒ¦ãƒ¼ã‚¶åã¾ãŸã¯ãƒ‘スワード。"
-#: actions/register.php:343
+#: actions/register.php:350
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
@@ -3308,41 +3330,63 @@ msgstr ""
"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã§æ–°ã—ã„アカウントを作æˆã§ãã¾ã™ã€‚ 次ã«ã¤ã¶ã‚„ãを投稿ã—ã¦ã€å‹äººã‚„"
"åŒåƒšã«ãƒªãƒ³ã‚¯ã§ãã¾ã™ã€‚ "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64文字ã®ã€å°æ–‡å­—アルファベットã‹æ•°å­—ã§ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚„å¥èª­ç‚¹ã¯é™¤ã。必須ã§ã™ã€‚"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6文字以上。必須ã§ã™ã€‚"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "上ã®ãƒ‘スワードã¨åŒã˜ã§ã™ã€‚ 必須。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "メール"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "æ›´æ–°ã€ã‚¢ãƒŠã‚¦ãƒ³ã‚¹ã€ãƒ‘スワードリカãƒãƒªãƒ¼ã§ã®ã¿ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "é•·ã„åå‰"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "個人情報を除ã: パスワードã€ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã€IMアドレスã€é›»è©±ç•ªå·"
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3375,7 +3419,7 @@ msgstr ""
"å‚加ã—ã¦ãã ã•ã£ã¦ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ã€‚ç§ãŸã¡ã¯ã‚ãªãŸãŒã“ã®ã‚µãƒ¼ãƒ“スを楽ã—ã‚“"
"ã§ä½¿ã£ã¦ãれるã“ã¨ã‚’願ã£ã¦ã„ã¾ã™ã€‚"
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3459,7 +3503,7 @@ msgstr "自分ã®ã¤ã¶ã‚„ãã¯ç¹°ã‚Šè¿”ã›ã¾ã›ã‚“。"
msgid "You already repeated that notice."
msgstr "ã™ã§ã«ãã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¦ã„ã¾ã™ã€‚"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "ç¹°ã‚Šè¿”ã•ã‚ŒãŸ"
@@ -3535,7 +3579,7 @@ msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ãƒ¦ãƒ¼ã‚¶ã‚’黙らã›ã‚‹ã“ã¨ãŒã§ãã¾
msgid "User doesn't have this role."
msgstr "åˆã£ã¦ã„るプロフィールã®ãªã„ユーザ"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3549,7 +3593,7 @@ msgstr "ユーザã¯ã™ã§ã«ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã™ã€‚"
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "セッション"
@@ -3592,7 +3636,7 @@ msgid "Icon"
msgstr "アイコン"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "åå‰"
@@ -3603,7 +3647,7 @@ msgid "Organization"
msgstr "組織"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "概è¦"
@@ -4241,7 +4285,7 @@ msgstr "コードãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "スナップショット"
@@ -4598,7 +4642,7 @@ msgstr ""
"ユーザã®ã¤ã¶ã‚„ãをフォローã™ã‚‹ã«ã¯è©³ç´°ã‚’確èªã—ã¦ä¸‹ã•ã„。ã ã‚Œã‹ã®ã¤ã¶ã‚„ãã‚’"
"フォローã™ã‚‹ãŸã‚ã«å°‹ã­ãªã„å ´åˆã¯ã€\"Reject\" をクリックã—ã¦ä¸‹ã•ã„。"
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "ライセンス"
@@ -4728,18 +4772,18 @@ msgstr "[グループを探ã—ã¦](%%action.groupsearch%%)ãã‚Œã«åŠ å…¥ã—ã¦ã
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%1$s ã‹ã‚‰ %2$s 上ã®æ›´æ–°ã‚’ã—ã¾ã—ãŸ!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4748,11 +4792,11 @@ msgstr ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "コントリビュータ"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4760,7 +4804,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4768,27 +4812,27 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "プラグイン"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "作者"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4798,13 +4842,13 @@ msgstr ""
"ファイル㯠%d ãƒã‚¤ãƒˆã§ã—ãŸã€‚よりå°ã•ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’アップロードã™ã‚‹ã‚ˆã†ã«ã—ã¦"
"ãã ã•ã„。"
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"ã“ã‚Œã»ã©å¤§ãã„ファイルã¯ã‚ãªãŸã®%dãƒã‚¤ãƒˆã®ãƒ¦ãƒ¼ã‚¶å‰²å½“ã¦ã‚’超ãˆã¦ã„ã‚‹ã§ã—ょã†ã€‚"
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4845,26 +4889,26 @@ msgid "Could not update message with new URI."
msgstr "æ–°ã—ã„URIã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’アップデートã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°è¿½åŠ  DB エラー: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚é•·ã™ãŽã§ã™ã€‚"
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ä¸æ˜Žãªãƒ¦ãƒ¼ã‚¶ã§ã™ã€‚"
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"多ã™ãŽã‚‹ã¤ã¶ã‚„ããŒé€Ÿã™ãŽã¾ã™; 数分間ã®ä¼‘ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†æŠ•ç¨¿ã—ã¦ãã ã•ã„。"
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4872,21 +4916,21 @@ msgstr ""
"多ã™ãŽã‚‹é‡è¤‡ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒé€Ÿã™ãŽã¾ã™; 数分間休ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†åº¦æŠ•ç¨¿ã—ã¦ãã ã•"
"ã„。"
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ã¤ã¶ã‚„ãを投稿ã™ã‚‹ã®ãŒç¦æ­¢ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4990,133 +5034,133 @@ msgid "Untitled page"
msgstr "å称未設定ページ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "プライマリサイトナビゲーション"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "パーソナルプロファイルã¨å‹äººã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "パーソナル"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "メールアドレスã€ã‚¢ãƒã‚¿ãƒ¼ã€ãƒ‘スワードã€ãƒ—ロパティã®å¤‰æ›´"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "サービスã¸æŽ¥ç¶š"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "接続"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "サイト設定ã®å¤‰æ›´"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "管ç†è€…"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "å‹äººã‚„åŒåƒšãŒ %s ã§åŠ ã‚るよã†èª˜ã£ã¦ãã ã•ã„。"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "招待"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "サイトã‹ã‚‰ãƒ­ã‚°ã‚¢ã‚¦ãƒˆ"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "ログアウト"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "アカウントを作æˆ"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "登録"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "ログイン"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "助ã‘ã¦ï¼"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "ヘルプ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "人々ã‹ãƒ†ã‚­ã‚¹ãƒˆã‚’検索"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5124,71 +5168,71 @@ msgstr "検索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "サイトã¤ã¶ã‚„ã"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "ローカルビュー"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "ページã¤ã¶ã‚„ã"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "セカンダリサイトナビゲーション"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "ヘルプ"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "About"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "よãã‚る質å•"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "プライãƒã‚·ãƒ¼"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "ソース"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "ãƒãƒƒã‚¸"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet ソフトウェアライセンス"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5198,13 +5242,13 @@ msgstr ""
"イクロブログサービスã§ã™ã€‚ "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ã¯ãƒžã‚¤ã‚¯ãƒ­ãƒ–ログサービスã§ã™ã€‚"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5216,54 +5260,54 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)。"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "サイト内容ライセンス"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "å‰>>"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5271,11 +5315,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5306,68 +5350,68 @@ msgid "Unable to delete design setting."
msgstr "デザイン設定を削除ã§ãã¾ã›ã‚“。"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "基本サイト設定"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "サイト"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "デザイン設定"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "デザイン"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "ユーザ設定"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "ユーザ"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "アクセス設定"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "パス設定"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "セッション設定"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "サイトã¤ã¶ã‚„ã"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "パス設定"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"APIリソースã¯èª­ã¿æ›¸ãアクセスãŒå¿…è¦ã§ã™ã€ã—ã‹ã—ã‚ãªãŸã¯èª­ã¿ã‚¢ã‚¯ã‚»ã‚¹ã—ã‹æŒã£ã¦"
@@ -5504,11 +5548,11 @@ msgstr "ã“ã®æ·»ä»˜ãŒç¾ã‚Œã‚‹ã¤ã¶ã‚„ã"
msgid "Tags for this attachment"
msgstr "ã“ã®æ·»ä»˜ã®ã‚¿ã‚°"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "パスワード変更ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "パスワード変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -5602,14 +5646,14 @@ msgstr "フルãƒãƒ¼ãƒ ï¼š %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "場所: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "ホームページ: %s"
@@ -6099,8 +6143,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 㯠%2$s ã§ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’èžã„ã¦ã„ã¾ã™ã€‚"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6126,19 +6177,19 @@ msgstr ""
"%8$s ã§ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹é€šçŸ¥ã‚ªãƒ—ションを変ãˆã¦ãã ã•ã„。\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "自己紹介: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ã¸æŠ•ç¨¿ã®ãŸã‚ã®æ–°ã—ã„メールアドレス"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, fuzzy, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6160,30 +6211,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ã®çŠ¶æ…‹"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS確èª"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "ã“ã®é›»è©±ç•ªå·ã¯ç¢ºèªå¾…ã¡ã§ã™ã€‚"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "ã‚ãªãŸã¯ %s ã«åˆå›³ã•ã‚Œã¦ã„ã¾ã™"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6211,13 +6262,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s ã‹ã‚‰ã®æ–°ã—ã„プライベートメッセージ"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6251,13 +6302,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ã¯ãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ã‚ãªãŸã®ã¤ã¶ã‚„ãを加ãˆã¾ã—ãŸ"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6296,7 +6347,7 @@ msgstr ""
"%6%s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6304,13 +6355,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ã¯ã‚ãªãŸå®›ã¦ã«ã¤ã¶ã‚„ãã‚’é€ã‚Šã¾ã—ãŸ"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6350,7 +6401,7 @@ msgstr ""
"ã«å¼•ã込むプライベートメッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚人々ã¯ã‚ãªãŸã ã‘ã¸ã®"
"メッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "from"
@@ -6517,23 +6568,23 @@ msgstr ""
msgid "at"
msgstr "at"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ã“ã®ã¤ã¶ã‚„ãã¸è¿”ä¿¡"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "返信"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¾ã—ãŸ"
@@ -6606,7 +6657,7 @@ msgstr "ã‚ãªãŸãŒé€ã£ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
msgid "Tags in %s's notices"
msgstr "%s ã®ã¤ã¶ã‚„ãã®ã‚¿ã‚°"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "ä¸æ˜Ž"
@@ -6643,7 +6694,7 @@ msgstr ""
msgid "All groups"
msgstr "å…¨ã¦ã®ã‚°ãƒ«ãƒ¼ãƒ—"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "未実装ã®ãƒ¡ã‚½ãƒƒãƒ‰ã€‚"
@@ -6667,7 +6718,7 @@ msgstr "フィーãƒãƒ£ãƒ¼ã•ã‚ŒãŸ"
msgid "Popular"
msgstr "人気"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "return-to 引数ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -6688,7 +6739,7 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã™"
msgid "Revoke the \"%s\" role from this user"
msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロック"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "single-user モードã®ãŸã‚ã®ã‚·ãƒ³ã‚°ãƒ«ãƒ¦ãƒ¼ã‚¶ãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
@@ -6786,6 +6837,51 @@ msgstr "タグ付ã‘ã¨ã—ã¦ã®äººã€…タグクラウド"
msgid "None"
msgstr "ãªã—"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "ファイルã®ã‚¢ãƒƒãƒ—ロードã§ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼"
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "ã‚¢ãƒã‚¿ãƒ¼ã®æ›´æ–°ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "リモートプロファイル更新エラー"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "上ä½æŠ•ç¨¿è€…"
@@ -6870,56 +6966,56 @@ msgid "Moderator"
msgstr "管ç†"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "数秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ç´„ 1 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ç´„ %d 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ç´„ 1 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ç´„ %d 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ç´„ 1 æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ç´„ %d æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ç´„ 1 ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ç´„ %d ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ç´„ 1 å¹´å‰"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index cdd7d77a5..ce2db363a 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:16+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:21+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -21,7 +21,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "ì ‘ê·¼"
@@ -83,25 +83,24 @@ msgid "Save"
msgstr "저장"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "해당하는 페ì´ì§€ ì—†ìŒ"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -114,7 +113,7 @@ msgid "No such user."
msgstr "해당하는 ì´ìš©ìž ì—†ìŒ"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s ë° ì¹œêµ¬ë“¤, %d 페ì´ì§€"
@@ -122,39 +121,39 @@ msgstr "%s ë° ì¹œêµ¬ë“¤, %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s ë° ì¹œêµ¬ë“¤"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "%sì˜ ì¹œêµ¬ë“¤ì— ëŒ€í•œ 피드 (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "%sì˜ ì¹œêµ¬ë“¤ì— ëŒ€í•œ 피드 (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%sì˜ ì¹œêµ¬ë“¤ì— ëŒ€í•œ 피드 (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "%s ë° ì¹œêµ¬ë“¤ì˜ íƒ€ìž„ë¼ì¸ì´ì§€ë§Œ, ì•„ì§ ì•„ë¬´ë„ ê¸€ì„ ìž‘ì„±í•˜ì§€ 않았습니다."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -164,14 +163,14 @@ msgstr ""
"ê°€ ê¸€ì„ ì¨ë³´ì„¸ìš”."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,64 +178,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "당신 ë° ì¹œêµ¬ë“¤"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$sì— ìžˆëŠ” %1$s ë° ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API 메서드 발견 안 ë¨."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "ì´ ë©”ì„œë“œëŠ” POST를 요구합니다."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "ì´ìš©ìžë¥¼ ì—…ë°ì´íŠ¸ í•  수 없습니다."
@@ -256,7 +255,7 @@ msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í•  수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -315,41 +314,41 @@ msgstr "%sì—게 ì§ì ‘ 메시지"
msgid "All the direct messages sent to %s"
msgstr "%sì—게 모든 ì§ì ‘ 메시지"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "메시지 ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "너무 ê¹ë‹ˆë‹¤. 최대 메시지 길ì´ëŠ” %d ìžê¹Œì§€ìž…니다."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "받는 사용ìžê°€ 없습니다."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "ë‹¹ì‹ ì˜ ì¹œêµ¬ê°€ ì•„ë‹Œ 사용ìžì—게 ì§ì ‘ 메시지를 보낼 수 없습니다."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "ê·¸ IDë¡œ ë°œê²¬ëœ ìƒíƒœê°€ 없습니다."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "ì´ ì†Œì‹ì€ ì´ë¯¸ 관심소ì‹ìœ¼ë¡œ 등ë¡ë˜ì–´ 있습니다."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "관심소ì‹ì„ ìƒì„±í•  수 없습니다."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "ì´ ì†Œì‹ì€ 관심소ì‹ì´ 아닙니다."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "관심소ì‹ì„ 삭제할 수 없습니다."
@@ -382,122 +381,122 @@ msgstr "소스 ì´ìš©ìžë¥¼ 확ì¸í•  수 없습니다."
msgid "Could not find target user."
msgstr "타겟 ì´ìš©ìžë¥¼ ì°¾ì„ ìˆ˜ 없습니다."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"ë³„ëª…ì€ ë°˜ë“œì‹œ ì˜ì†Œë¬¸ìžì™€ 숫ìžë¡œë§Œ ì´ë£¨ì–´ì ¸ì•¼ 하며 스페ì´ìŠ¤ì˜ ì‚¬ìš©ì´ ë¶ˆê°€ 합니"
"다."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "ë³„ëª…ì´ ì´ë¯¸ 사용중 입니다. 다른 ë³„ëª…ì„ ì‹œë„í•´ 보십시오."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "유효한 ë³„ëª…ì´ ì•„ë‹™ë‹ˆë‹¤"
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "ì‹¤ëª…ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 255글ìž)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ì„¤ëª…ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 %d 글ìž)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "위치가 너무 ê¹ë‹ˆë‹¤. (최대 255글ìž)"
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "사용할 수 없는 별명 : \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "별명 \"%s\" ì´ ì´ë¯¸ 사용중 입니다. 다른 ë³„ëª…ì„ ì‹œë„í•´ 보십시오."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "ê·¸ë£¹ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ì´ìš©ìž %1$s ì˜ ê·¸ë£¹ %2$s ê°€ìž…ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ 제거할 수 없습니다."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%sì˜ ê·¸ë£¹ë“¤"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%s ê·¸ë£¹ë“¤ì€ ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s 그룹"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "%s ìƒì˜ 그룹들"
@@ -513,15 +512,15 @@ msgstr "옳지 ì•Šì€ í¬ê¸°"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -586,12 +585,12 @@ msgstr ""
"$s ê³„ì •ì˜ ì ‘ê·¼ì„ í—ˆìš©í•´ì•¼ 합니다."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "계정"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -599,8 +598,8 @@ msgid "Nickname"
msgstr "별명"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "비밀 번호"
@@ -616,11 +615,11 @@ msgstr "허용"
msgid "Allow or deny access to your account information."
msgstr "계정 ì •ë³´ì— ëŒ€í•œ ì ‘ê·¼ì„ í—ˆìš© ë˜ëŠ” 거부합니다."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "ì´ ë©”ì„œë“œëŠ” POST ë˜ëŠ” DELETE를 요구합니다."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "ë‹¹ì‹ ì€ ë‹¤ë¥¸ 사용ìžì˜ ìƒíƒœë¥¼ 삭제하지 ì•Šì•„ë„ ëœë‹¤."
@@ -637,25 +636,25 @@ msgstr "ìžê¸° ìžì‹ ì˜ 소ì‹ì€ 재전송할 수 없습니다."
msgid "Already repeated that notice."
msgstr "ì´ë¯¸ ìž¬ì „ì†¡ëœ ì†Œì‹ìž…니다."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "ì‚­ì œëœ ì†Œì‹ìž…니다."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” %d ê¸€ìž ìž…ë‹ˆë‹¤."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "ì°¾ì„ ìˆ˜ê°€ 없습니다."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "소ì‹ì˜ 최대 길ì´ëŠ” 첨부 URLì„ í¬í•¨í•˜ì—¬ %d 글ìžìž…니다."
@@ -664,32 +663,32 @@ msgstr "소ì‹ì˜ 최대 길ì´ëŠ” 첨부 URLì„ í¬í•¨í•˜ì—¬ %d 글ìžìž…니다
msgid "Unsupported format."
msgstr "지ì›í•˜ì§€ 않는 형ì‹ìž…니다."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / %sì˜ ì¢‹ì•„í•˜ëŠ” 글들"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 좋아하는 ê¸€ì´ ì—…ë°ì´íŠ¸ ë습니다. %Sì— ì˜í•´ / %s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / %2$sì—게 답신 ì—…ë°ì´íŠ¸"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$së‹˜ì´ %2$s/%3$sì˜ ì—…ë°ì´íŠ¸ì— 답변했습니다."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 공개 타임ë¼ì¸"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "모ë‘ë¡œë¶€í„°ì˜ ì—…ë°ì´íŠ¸ %sê°œ!"
@@ -704,12 +703,12 @@ msgstr "%sì— ë‹µì‹ "
msgid "Repeats of %s"
msgstr "%sì— ë‹µì‹ "
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "%s íƒœê·¸ëœ í†µì§€"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$sì— ìžˆëŠ” %1$sì˜ ì—…ë°ì´íŠ¸!"
@@ -767,7 +766,7 @@ msgid "Preview"
msgstr "미리보기"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "삭제"
@@ -808,11 +807,11 @@ msgstr "아바타가 ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤."
msgid "You already blocked that user."
msgstr "ì´ë¯¸ ì°¨ë‹¨ëœ ì´ìš©ìžìž…니다."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "사용ìžë¥¼ 차단합니다."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -826,7 +825,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -836,7 +835,7 @@ msgstr "아니오"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "ì´ìš©ìžë¥¼ 차단하지 않는다."
@@ -845,7 +844,7 @@ msgstr "ì´ìš©ìžë¥¼ 차단하지 않는다."
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -854,11 +853,11 @@ msgid "Yes"
msgstr "네, 맞습니다."
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "ì´ ì‚¬ìš©ìž ì°¨ë‹¨í•˜ê¸°"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ì •ë³´ì°¨ë‹¨ì„ ì €ìž¥í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
@@ -990,14 +989,13 @@ msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "그러한 통지는 없습니다."
+msgstr "ì‘용프로그램 ì‚­ì œ"
#: actions/deleteapplication.php:149
msgid ""
@@ -1024,7 +1022,7 @@ msgstr "ì´ ê²Œì‹œê¸€ 삭제하기"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "로그ì¸í•˜ê³  있지 않습니다."
@@ -1056,7 +1054,7 @@ msgid "Do not delete this notice"
msgstr "ì´ í†µì§€ë¥¼ 지울 수 없습니다."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "ì´ ê²Œì‹œê¸€ 삭제하기"
@@ -1097,45 +1095,54 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr "ì´ StatusNet 사ì´íŠ¸ì— 대한 ë””ìžì¸ 설정"
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "ìž˜ëª»ëœ ë¡œê³  URL 입니다."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "테마를 ì´ìš©í•  수 없습니다: %s"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "로고 변경"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "사ì´íŠ¸ 로고"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "테마 바꾸기"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "사ì´íŠ¸ 테마"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "사ì´íŠ¸ì— 대한 테마"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "사ì´íŠ¸ 테마"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "ë°°ê²½ ì´ë¯¸ì§€ 바꾸기"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "ë°°ê²½"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1144,60 +1151,68 @@ msgstr ""
"사ì´íŠ¸ì˜ ë°°ê²½ ì´ë¯¸ì§€ë¥¼ 업로드할 수 있습니다. 최대 íŒŒì¼ í¬ê¸°ëŠ” %1$s 입니다."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "켜기"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "ë„기"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "ë°°ê²½ ì´ë¯¸ì§€ë¥¼ 켜거나 ëˆë‹¤."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "ë°°ê²½ ì´ë¯¸ì§€ë¥¼ 반복 나열"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "ìƒ‰ìƒ ë³€ê²½"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "ì—°ê²°"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "검색"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "문ìž"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "로그ì¸"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1207,7 +1222,7 @@ msgstr ""
msgid "Save"
msgstr "저장"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1493,7 +1508,7 @@ msgid "Cannot normalize that email address"
msgstr "ê·¸ ì´ë©”ì¼ ì£¼ì†Œë¥¼ 정규화 í•  수 없습니다."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "유효한 ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다."
@@ -1654,9 +1669,8 @@ msgid "No notice."
msgstr "새로운 통지"
#: actions/file.php:42
-#, fuzzy
msgid "No attachments."
-msgstr "그러한 문서는 없습니다."
+msgstr "첨부문서 ì—†ìŒ"
#: actions/file.php:51
#, fuzzy
@@ -1729,13 +1743,13 @@ msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "í”„ë¡œí•„ì„ ì§€ì •í•˜ì§€ 않았습니다."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "해당 IDì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
@@ -1881,7 +1895,7 @@ msgstr "ì´ ì´ìš©ìžë¥¼ 관리ìžë¡œ 만듦"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s 타임ë¼ì¸"
@@ -2297,51 +2311,55 @@ msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
msgid "%1$s left group %2$s"
msgstr "%s가 그룹%s를 떠났습니다."
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "ì´ë¯¸ ë¡œê·¸ì¸ í•˜ì…¨ìŠµë‹ˆë‹¤."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "틀린 계정 ë˜ëŠ” 비밀 번호"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "ì¸ì¦ì´ ë˜ì§€ 않았습니다."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "로그ì¸"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "사ì´íŠ¸ì— 로그ì¸í•˜ì„¸ìš”."
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ìžë™ 로그ì¸"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 ìžë™ìœ¼ë¡œ 로그ì¸í•©ë‹ˆë‹¤. 공용 컴퓨터ì—서는 ì´ìš©í•˜ì§€ 마십시오!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "비밀 번호를 잊으셨나요?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"ë³´ì•ˆì„ ìœ„í•´ ì„¸íŒ…ì„ ì €ìž¥í•˜ê¸° ì „ì— ê³„ì •ê³¼ 비밀 번호를 다시 ìž…ë ¥ í•´ 주십시오."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ì‚¬ìš©ìž ì´ë¦„ê³¼ 비밀번호로 로그ì¸"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"ê·€í•˜ì˜ ê³„ì •ê³¼ 비밀 번호로 ë¡œê·¸ì¸ í•˜ì„¸ìš”. ê³„ì •ì´ ì•„ì§ ì—†ìœ¼ì„¸ìš”? [가입](%%"
"action.register%%) 새 ê³„ì •ì„ ìƒì„± ë˜ëŠ” [OpenID](%%action.openidlogin%%)를 사"
@@ -2548,31 +2566,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$sì˜ ìƒíƒœ (%2$sì—ì„œ)"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "ì—°ê²°"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다."
@@ -2682,7 +2700,7 @@ msgid "6 or more characters"
msgstr "6ê¸€ìž ì´ìƒ"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "ì¸ì¦"
@@ -2694,11 +2712,11 @@ msgstr "위와 ê°™ì€ ë¹„ë°€ 번호"
msgid "Change"
msgstr "변환"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "비밀번호는 6ìžë¦¬ ì´ìƒì´ì–´ì•¼ 합니다."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "비밀 번호가 ì¼ì¹˜í•˜ì§€ 않습니다."
@@ -2719,7 +2737,7 @@ msgid "Password saved."
msgstr "비밀 번호 저장"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2935,44 +2953,44 @@ msgstr "프로필 정보"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64ìž ì‚¬ì´ì— ì˜ì†Œë¬¸ìž, 숫ìžë¡œë§Œ ì”니다. 기호나 ê³µë°±ì„ ì“°ë©´ 안 ë©ë‹ˆë‹¤."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "실명"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "홈페ì´ì§€"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ê·€í•˜ì˜ í™ˆíŽ˜ì´ì§€, 블로그 í˜¹ì€ ë‹¤ë¥¸ 사ì´íŠ¸ì˜ 프로필 페ì´ì§€ URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "140ìž ì´ë‚´ì—ì„œ ìžê¸° 소개"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "ë‹¹ì‹ ì— ëŒ€í•´ 소개해주세요."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ìžê¸°ì†Œê°œ"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "위치"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "ë‹¹ì‹ ì€ ì–´ë””ì— ì‚½ë‹ˆê¹Œ? \"ì‹œ, ë„ (or êµ°,구), 나ë¼"
@@ -3012,7 +3030,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "나ì—게 구ë…하는 사람ì—게 ìžë™ êµ¬ë… ì‹ ì²­"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "ìžê¸°ì†Œê°œê°€ 너무 ê¹ë‹ˆë‹¤. (최대 140글ìž)"
@@ -3263,7 +3281,7 @@ msgstr "비밀 번호는 6ìž ì´ìƒì´ì–´ì•¼ 합니다."
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 ì¼ì¹˜í•˜ì§€ 않습니다."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ì‚¬ìš©ìž ì„¸íŒ… 오류"
@@ -3272,81 +3290,103 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"새로운 비밀 번호를 성공ì ìœ¼ë¡œ 저장했습니다. 귀하는 ì´ì œ ë¡œê·¸ì¸ ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "죄송합니다. 단지 ì´ˆëŒ€ëœ ì‚¬ëžŒë“¤ë§Œ 등ë¡í•  수 있습니다."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "í™•ì¸ ì½”ë“œ 오류"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "íšŒì› ê°€ìž…ì´ ì„±ê³µì ìž…니다."
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "회ì›ê°€ìž…"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "ê°€ìž…ì´ í—ˆìš©ë˜ì§€ 않습니다."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "ë¼ì´ì„ ìŠ¤ì— ë™ì˜í•˜ì§€ 않는다면 등ë¡í•  수 없습니다."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "ì´ë©”ì¼ ì£¼ì†Œê°€ ì´ë¯¸ 존재 합니다."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "ì‚¬ìš©ìž ì´ë¦„ì´ë‚˜ 비밀 번호가 틀렸습니다."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64ìž ì‚¬ì´ì— ì˜ì†Œë¬¸ìž, 숫ìžë¡œë§Œ ì”니다. 기호나 ê³µë°±ì„ ì“°ë©´ 안 ë©ë‹ˆë‹¤. 필수 "
"ìž…ë ¥."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6ê¸€ìž ì´ìƒì´ 필요합니다."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "위와 ê°™ì€ ë¹„ë°€ 번호. 필수 사항."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "ì´ë©”ì¼"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "ì—…ë°ì´íŠ¸ë‚˜ 공지, 비밀번호 ì°¾ê¸°ì— ì‚¬ìš©í•˜ì„¸ìš”."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "ë”ìš± 긴 ì´ë¦„ì„ ìš”êµ¬í•©ë‹ˆë‹¤."
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "ë‹¤ìŒ ê°œì¸ì •ë³´ 제외: 비밀 번호, ë©”ì¼ ì£¼ì†Œ, 메신저 주소, ì „í™” 번호"
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3379,7 +3419,7 @@ msgstr ""
"\n"
"다시 한번 가입하신 ê²ƒì„ í™˜ì˜í•˜ë©´ì„œ ì¦ê±°ìš´ 서비스가 ë˜ì…¨ìœ¼ë©´ 합니다."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3466,7 +3506,7 @@ msgstr "ìžì‹ ì˜ ê¸€ì€ ìž¬ì „ì†¡í•  수 없습니다."
msgid "You already repeated that notice."
msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ì‚¬ìš©ìžë¥¼ 차단하고 있습니다."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "재전송ë¨"
@@ -3536,7 +3576,7 @@ msgstr "ë‹¹ì‹ ì€ ì´ ì‚¬ìš©ìžì—게 메시지를 보낼 수 없습니다."
msgid "User doesn't have this role."
msgstr "프로필 ë§¤ì¹­ì´ ì—†ëŠ” 사용ìž"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "아바타가 ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤."
@@ -3552,7 +3592,7 @@ msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3598,7 +3638,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3611,7 +3651,7 @@ msgid "Organization"
msgstr "페ì´ì§€ìˆ˜"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "설명"
@@ -4226,7 +4266,7 @@ msgstr "코드가 ìž…ë ¥ ë˜ì§€ 않았습니다."
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4581,7 +4621,7 @@ msgstr ""
"사용ìžì˜ 통지를 구ë…하려면 ìƒì„¸ë¥¼ 확ì¸í•´ 주세요. 구ë…하지 않는 경우는, \"취소"
"\"를 í´ë¦­í•´ 주세요."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
#, fuzzy
msgid "License"
msgstr "ë¼ì´ì„ ìŠ¤"
@@ -4712,29 +4752,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%2$sì— ìžˆëŠ” %1$sì˜ ì—…ë°ì´íŠ¸!"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "통계"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4742,7 +4782,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4750,39 +4790,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "버젼"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4825,28 +4865,28 @@ msgid "Could not update message with new URI."
msgstr "새 URI와 함께 메시지를 ì—…ë°ì´íŠ¸í•  수 없습니다."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "해쉬테그를 추가 í•  ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "게시글 저장문제. ì•Œë ¤ì§€ì§€ì•Šì€ íšŒì›"
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"너무 ë§Žì€ ê²Œì‹œê¸€ì´ ë„ˆë¬´ 빠르게 올ë¼ì˜µë‹ˆë‹¤. 한숨고르고 ëª‡ë¶„í›„ì— ë‹¤ì‹œ í¬ìŠ¤íŠ¸ë¥¼ "
"해보세요."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4855,22 +4895,22 @@ msgstr ""
"너무 ë§Žì€ ê²Œì‹œê¸€ì´ ë„ˆë¬´ 빠르게 올ë¼ì˜µë‹ˆë‹¤. 한숨고르고 ëª‡ë¶„í›„ì— ë‹¤ì‹œ í¬ìŠ¤íŠ¸ë¥¼ "
"해보세요."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "ì´ ì‚¬ì´íŠ¸ì— 게시글 í¬ìŠ¤íŒ…으로부터 ë‹¹ì‹ ì€ ê¸ˆì§€ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -4978,131 +5018,131 @@ msgid "Untitled page"
msgstr "제목없는 페ì´ì§€"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "주 사ì´íŠ¸ 네비게ì´ì…˜"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "ê°œì¸ í”„ë¡œí•„ê³¼ 친구 타임ë¼ì¸"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "ê°œì¸ì ì¸"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "ë‹¹ì‹ ì˜ ì´ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”."
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "ì„œë²„ì— ìž¬ì ‘ì† í•  수 없습니다 : %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "ì—°ê²°"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "주 사ì´íŠ¸ 네비게ì´ì…˜"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "관리ìž"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "%sì— ì¹œêµ¬ë¥¼ 가입시키기 위해 친구와 ë™ë£Œë¥¼ 초대합니다."
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "초대"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "ì´ ì‚¬ì´íŠ¸ë¡œë¶€í„° 로그아웃"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "로그아웃"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "계정 만들기"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "회ì›ê°€ìž…"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ì´ ì‚¬ì´íŠ¸ 로그ì¸"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "로그ì¸"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ë„ì›€ì´ í•„ìš”í•´!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "ë„움ë§"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "프로필ì´ë‚˜ í…스트 검색"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5110,72 +5150,72 @@ msgstr "검색"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "사ì´íŠ¸ 공지"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "로컬 뷰"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "페ì´ì§€ 공지"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "ë³´ì¡° 사ì´íŠ¸ 네비게ì´ì…˜"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "ë„움ë§"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "ì •ë³´"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "ìžì£¼ 묻는 질문"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "ê°œì¸ì •ë³´ 취급방침"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "소스 코드"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "ì—°ë½í•˜ê¸°"
-#: lib/action.php:784
+#: lib/action.php:794
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ ìŠ¤"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5185,13 +5225,13 @@ msgstr ""
"마ì´í¬ë¡œë¸”로깅서비스입니다."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 는 마ì´í¬ë¡œë¸”로깅서비스입니다."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5203,55 +5243,55 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html) ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì‚¬ìš©í•  수 있습니다."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ ìŠ¤"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "ì•ž 페ì´ì§€"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5259,11 +5299,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5299,74 +5339,74 @@ msgid "Unable to delete design setting."
msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í•  수 없습니다."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "ì´ë©”ì¼ ì£¼ì†Œ 확ì¸ì„œ"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "초대"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "ê°œì¸ì ì¸"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "ì´ìš©ìž"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "사ì´íŠ¸ 공지"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5502,12 +5542,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "비밀번호 변경"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "비밀번호 변경"
@@ -5600,14 +5640,14 @@ msgstr "ì „ì²´ì´ë¦„: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "위치: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "홈페ì´ì§€: %s"
@@ -6096,8 +6136,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$së‹˜ì´ ê·€í•˜ì˜ ì•Œë¦¼ 메시지를 %2$sì—ì„œ 듣고 있습니다."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6117,7 +6164,7 @@ msgstr ""
"그럼 ì´ë§Œ,%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6125,13 +6172,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%sì— í¬ìŠ¤íŒ… í•  새로운 ì´ë©”ì¼ ì£¼ì†Œ"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6147,30 +6194,30 @@ msgstr ""
"오.ì´ë©”ì¼ ì‚¬ìš©ë²•ì€ %3$s 페ì´ì§€ë¥¼ 보십시오.안녕히,%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ìƒíƒœ"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS ì¸ì¦"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "ì´ ì „í™” 번호는 ì¸ì¦ 대기중입니다."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 사용ìžê°€ 찔러 봤습니다."
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6187,13 +6234,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s로부터 새로운 비밀 메시지가 ë„착하였습니다."
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6213,13 +6260,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%së‹˜ì´ ë‹¹ì‹ ì˜ ê²Œì‹œê¸€ì„ ì¢‹ì•„í•˜ëŠ” 글로 추가했습니다."
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6241,7 +6288,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6249,13 +6296,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6292,7 +6339,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr "다ìŒì—ì„œ:"
@@ -6452,25 +6499,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "ìƒì„±"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "답장하기"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤."
@@ -6545,7 +6592,7 @@ msgstr "ë‹¹ì‹ ì˜ ë³´ë‚¸ 메시지들"
msgid "Tags in %s's notices"
msgstr "%sì˜ ê²Œì‹œê¸€ì˜ íƒœê·¸"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "알려지지 ì•Šì€ í–‰ë™"
@@ -6584,7 +6631,7 @@ msgstr ""
msgid "All groups"
msgstr "모든 그룹"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6608,7 +6655,7 @@ msgstr "피ì³ë§ë¨"
msgid "Popular"
msgstr "ì¸ê¸°ìžˆëŠ”"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "id ì¸ìžê°€ 없습니다."
@@ -6632,7 +6679,7 @@ msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기"
msgid "Revoke the \"%s\" role from this user"
msgstr "ì´ ê·¸ë£¹ì˜ íšŒì›ë¦¬ìŠ¤íŠ¸"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6736,6 +6783,51 @@ msgstr ""
msgid "None"
msgstr "ì—†ìŒ"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "파ì¼ì„ ì˜¬ë¦¬ëŠ”ë° ì‹œìŠ¤í…œ 오류 ë°œìƒ"
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "아바타 ì—…ë°ì´íŠ¸ 실패"
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "리모트 프로필 ì—…ë°ì´íŠ¸ 오류"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "ìƒìœ„ 게시글 등ë¡ìž"
@@ -6822,56 +6914,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì „"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "1ë…„ ì „"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 0d377eefa..09836ffa5 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:19+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:26+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -22,14 +22,14 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "ПриÑтап"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
msgid "Site access settings"
-msgstr "Ðагодувања за приÑтап на веб-Ñтраницата"
+msgstr "Ðагодувања за приÑтап на мрежното меÑто"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
@@ -40,8 +40,8 @@ msgstr "РегиÑтрација"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
-"Да им забранам на анонимните (ненајавени) кориÑници да ја гледаат веб-"
-"Ñтраницата?"
+"Да им забранам на анонимните (ненајавени) кориÑници да го гледаат мрежното "
+"меÑто?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
@@ -86,24 +86,24 @@ msgid "Save"
msgstr "Зачувај"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Ðема таква Ñтраница."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -116,7 +116,7 @@ msgid "No such user."
msgstr "Ðема таков кориÑник."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s и пријателите, ÑÑ‚Ñ€. %2$d"
@@ -124,40 +124,40 @@ msgstr "%1$s и пријателите, ÑÑ‚Ñ€. %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s и пријатели"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Канал Ñо пријатели на %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Канал Ñо пријатели на %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Канал за пријатели на %S (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
"Ова е иÑторијата за %s и пријателите, но доÑега никој нема објавено ништо."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -167,7 +167,7 @@ msgstr ""
"groups%%) или објавете нешто Ñамите."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -177,7 +177,7 @@ msgstr ""
"на кориÑникот или да [објавите нешто што Ñакате тој да го прочита](%%%%"
"action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,58 +188,58 @@ msgstr ""
"прочита."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Вие и пријателите"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Подновувања од %1$s и пријатели на %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API методот не е пронајден."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Овој метод бара POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -247,7 +247,7 @@ msgstr ""
"Мора да назначите параметар Ñо име 'device' Ñо една од Ñледниве вредноÑти: "
"sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Ðе можев да го подновам кориÑникот."
@@ -267,7 +267,7 @@ msgstr "Ðе може да Ñе зачува профил."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -276,8 +276,8 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
-"Серверот не можеше да обработи толку многу POST-податоци (%s бајти) заради "
-"неговата тековна конфигурација."
+"ОпÑлужувачот не можеше да обработи толку многу POST-податоци (%s бајти) "
+"заради неговата тековна поÑтавеноÑÑ‚."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
@@ -326,42 +326,42 @@ msgstr "Директни пораки до %s"
msgid "All the direct messages sent to %s"
msgstr "Сите директни пораки иÑпратени до %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Ðема текÑÑ‚ за пораката!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Ова е предолго. МакÑималната должина изнеÑува %d знаци."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Примачот не е пронајден."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Ðеможете да иÑпраќате директни пораки на кориÑници што не ви Ñе пријатели."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо таков ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Овој ÑÑ‚Ð°Ñ‚ÑƒÑ Ð²ÐµÑœÐµ Ви е омилен."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Ðе можам да Ñоздадам омилина забелешка."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Тој ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ви е омилен."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Ðе можам да ја избришам омилената забелешка."
@@ -372,7 +372,7 @@ msgstr "Ðе можам да го Ñледам кориÑникот: КориÑÐ
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr "Ðе можам да го Ñледам кориÑникот: %s веќе е на Вашата лиÑта."
+msgstr "Ðе можам да го Ñледам кориÑникот: %s веќе е на Вашиот ÑпиÑок."
#: actions/apifriendshipsdestroy.php:109
msgid "Could not unfollow user: User not found."
@@ -396,119 +396,119 @@ msgstr "Ðе можев да го утврдам целниот кориÑник
msgid "Could not find target user."
msgstr "Ðе можев да го пронајдам целниот кориÑник."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Прекарот мора да има Ñамо мали букви и бројки и да нема празни меÑта."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ðеправилен прекар."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Главната Ñтраница не е важечка URL-адреÑа."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
-msgstr "Целото име е предолго (макÑимум 255 знаци)"
+msgstr "Целото име е предолго (највеќе 255 знаци)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ОпиÑот е предолг (дозволено е највеќе %d знаци)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Локацијата е предолга (макÑимумот е 255 знаци)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Премногу алијаÑи! Дозволено е највеќе %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ðеважечки алијаÑ: „%s“."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "ÐлијаÑот „%s“ е зафатен. Одберете друг."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "ÐлијаÑот не може да биде иÑÑ‚ како прекарот."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Групата не е пронајдена."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Веќе членувате во таа група."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Блокирани Ñте од таа група од админиÑтраторот."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Ðе можам да го зачленам кориÑникот %1$s во групата 2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Ðе членувате во оваа група."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s групи"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s групи кадешто членува %2$s."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s групи"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "групи на %s"
@@ -523,15 +523,15 @@ msgstr "Погрешен жетон."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -597,12 +597,12 @@ msgstr ""
"приÑтап до Вашата %4$s Ñметка Ñамо на трети Ñтрани на кои им верувате."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Прекар"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Лозинка"
@@ -627,11 +627,11 @@ msgstr "Дозволи"
msgid "Allow or deny access to your account information."
msgstr "Дозволете или одбијте приÑтап до податоците за Вашата Ñметка."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Методот бара POST или DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Ðе можете да избришете ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° друг кориÑник."
@@ -648,25 +648,25 @@ msgstr "Ðе можете да ја повторувате ÑопÑтвенатÐ
msgid "Already repeated that notice."
msgstr "Забелешката е веќе повторена."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "СтатуÑот е избришан."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо тој ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ова е предолго. МакÑималната дозволена должина изнеÑува %d знаци."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе е пронајдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -677,32 +677,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Ðеподдржан формат."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Омилени од %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Подновувања кои Ñпоменуваат %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s подновувања коишто Ñе одговор на подновувањата од %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Јавна иÑторија на %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s подновуввања од Ñите!"
@@ -717,12 +717,12 @@ msgstr "Повторено за %s"
msgid "Repeats of %s"
msgstr "Повторувања на %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Забелешки означени Ñо %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Подновувањата Ñе означени Ñо %1$s на %2$s!"
@@ -781,7 +781,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Бриши"
@@ -821,11 +821,11 @@ msgstr "Ðватарот е избришан."
msgid "You already blocked that user."
msgstr "Веќе го имате блокирано тој кориÑник."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокирај кориÑник"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -841,7 +841,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -850,7 +850,7 @@ msgstr "Ðе"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ðе го блокирај кориÑников"
@@ -859,7 +859,7 @@ msgstr "Ðе го блокирај кориÑников"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -867,11 +867,11 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокирај го кориÑников"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ðе можев да ги Ñнимам инофрмациите за блокот."
@@ -998,7 +998,7 @@ msgstr "Ðе Ñте ÑопÑтвеник на овој програм."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон."
@@ -1032,7 +1032,7 @@ msgstr "Избриши го програмов"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ðе Ñте најавени."
@@ -1063,7 +1063,7 @@ msgid "Do not delete this notice"
msgstr "Ðе ја бриши оваа забелешка"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Бриши ја оваа забелешка"
@@ -1101,107 +1101,123 @@ msgstr "Изглед"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site."
-msgstr "Ðагодувања на изгледот на оваа StatusNet веб-Ñтраница."
+msgstr "Ðагодувања на изгледот на ова StatusNet-мрежно меÑто."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Погрешен URL на лого."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Темата е недоÑтапна: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Промени лого"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
-msgstr "Лого на веб-Ñтраницата"
+msgstr "Лого на мрежното меÑто"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
-msgstr "Промени тема"
+msgstr "Промени изглед"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
-msgstr "Тема на веб-Ñтраницата"
+msgstr "Изглед на мрежното меÑто"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
-msgstr "Тема за веб-Ñтраницата."
+msgstr "Изглед за мрежното меÑто."
+
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Прилагоден мотив"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr "Можете да подигнете Ñвој изглед за StatusNet како .ZIP архив."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Промена на Ñлика на позадина"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Позадина"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-"Може да подигнете позадинÑка Ñлика за оваа веб-Ñтраница. МакÑималната "
+"Може да подигнете позадинÑка Ñлика за ова мрежно меÑто. МакÑималната "
"големина на податотеката е %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "ИÑкл."
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Вклучи или иÑклучи позадинÑка Ñлика."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Позадината во квадрати"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Промена на бои"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Содржина"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Странична лента"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "ТекÑÑ‚"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Ð’Ñ€Ñки"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Ðапредно"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Прилагодено CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "КориÑти по оÑновно"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Врати оÑновно-зададени нагодувања"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Врати по оÑновно"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1211,7 +1227,7 @@ msgstr "Врати по оÑновно"
msgid "Save"
msgstr "Зачувај"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Зачувај изглед"
@@ -1251,7 +1267,7 @@ msgstr "Треба име."
#: actions/editapplication.php:180 actions/newapplication.php:165
msgid "Name is too long (max 255 chars)."
-msgstr "Името е предолго (макÑимум 255 знаци)."
+msgstr "Името е предолго (највеќе 255 знаци)."
#: actions/editapplication.php:183 actions/newapplication.php:162
msgid "Name already in use. Try another one."
@@ -1314,7 +1330,7 @@ msgstr "ОБразецов Ñлужи за уредување на групатÐ
#: actions/editgroup.php:205 actions/newgroup.php:145
#, php-format
msgid "description is too long (max %d chars)."
-msgstr "опиÑот е предолг (макÑимум %d знаци)"
+msgstr "опиÑот е предолг (највеќе %d знаци)"
#: actions/editgroup.php:228 actions/newgroup.php:168
#, php-format
@@ -1484,7 +1500,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðеможам да ја нормализирам таа е-поштенÑка адреÑа"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ðеправилна адреÑа за е-пошта."
@@ -1587,7 +1603,7 @@ msgstr "Популарни забелешки, ÑÑ‚Ñ€. %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "Моментално најпопуларни забелешки на веб-Ñтраницата."
+msgstr "Моментално најпопуларни забелешки на мрежното меÑто."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1704,7 +1720,7 @@ msgstr "Оваа улога е резервирана и не може да Ñе
#: actions/grantrole.php:75
msgid "You cannot grant user roles on this site."
-msgstr "Ðе можете да им доделувате улоги на кориÑниците на оваа веб-Ñтраница."
+msgstr "Ðе можете да им доделувате улоги на кориÑниците на ова мрежно меÑто."
#: actions/grantrole.php:82
msgid "User already has this role."
@@ -1712,13 +1728,13 @@ msgstr "КориÑникот веќе ја има таа улога."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ðема назначено профил."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðема профил Ñо тоа ID."
@@ -1835,7 +1851,7 @@ msgstr "Членови на групата %1$s, ÑÑ‚Ñ€. %2$d"
#: actions/groupmembers.php:118
msgid "A list of the users in this group."
-msgstr "ЛиÑта на кориÑниците на овааг група."
+msgstr "СпиÑок на кориÑниците на оваа група."
#: actions/groupmembers.php:182 lib/groupnav.php:107
msgid "Admin"
@@ -1861,7 +1877,7 @@ msgstr "Ðаправи го кориÑникот админиÑтратор"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "ИÑторија на %s"
@@ -1991,7 +2007,7 @@ msgid ""
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
"Чекам потврда за оваа адреÑа. Проверете ја Вашата Jabber/GTalk Ñметка за "
-"порака Ñо понатамошни инÑтрукции. (Дали го додадовте %s на Вашата лиÑта Ñо "
+"порака Ñо понатамошни инÑтрукции. (Дали го додадовте %s на Вашиот ÑпиÑок Ñо "
"пријатели?)"
#. TRANS: IM address input field instructions in IM settings form.
@@ -2002,8 +2018,8 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Jabber или GTalk адреÑа како „ime@example.org“. Ðо прво додајте го %s во "
-"Вашата контакт лиÑта во Вашиот IM клиент или GTalk."
+"Jabber или GTalk адреÑа како „KorisnickoIme@example.org“. Ðо прво додајте го "
+"%s во Вашиот контактен ÑпиÑок во Вашиот IM клиент или GTalk."
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
@@ -2163,15 +2179,15 @@ msgid ""
"on the site. Thanks for growing the community!"
msgstr ""
"Ќе добиете извеÑтување кога луѓето кои Ñте ги поканиле ќе ја прифатат "
-"поканата и ќе Ñе региÑтрираат на веб-Ñтраницата. Ви благодариме за Вашата "
-"помош Ñо проширувањето на заедницата!"
+"поканата и ќе Ñе региÑтрираат на мрежното меÑто. Ви благодариме што ни "
+"помагате да ја прошириме заедницата!"
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
-"Со овој обраец можете да поканите пријатели и колеги да ја кориÑтат веб-"
-"Ñтраницата."
+"Со овој обраец можете да поканите пријатели и колеги да го кориÑтат мрежното "
+"меÑто."
#: actions/invite.php:187
msgid "Email addresses"
@@ -2234,7 +2250,7 @@ msgid ""
msgstr ""
"%1$s Ве кани да Ñе придружите на %2$s (%3$s).\n"
"\n"
-"%2$s е веб-Ñтраница за микроблогирање што ви овозможува да бидете во тек "
+"%2$s е мрежно меÑто за микроблогирање што ви овозможува да бидете во тек "
"луѓето што ги познавате и луѓето кои ве интереÑираат.\n"
"\n"
"Можете да објавувате и новоÑти за ВаÑ, Ваши размиÑли, и наÑтани од Вашиот "
@@ -2249,7 +2265,7 @@ msgstr ""
"\n"
"%5$s\n"
"\n"
-"Ðко Ñакате да ја иÑпробате оваа друштвена веб-Ñтраница, кликнете на врÑката "
+"Ðко Ñакате да ја иÑпробате оваа друштвено мрежно меÑто, кликнете на врÑката "
"подолу за да ја прифатите поканата.\n"
"\n"
"%6$s\n"
@@ -2289,41 +2305,41 @@ msgstr "Ðе членувате во таа група."
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Веќе Ñте најавени."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Ðеточно кориÑничко име или лозинка"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Грешка при поÑтавувањето на кориÑникот. Веројатно не Ñе заверени."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ðајава"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ðајавете Ñе"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Следниот пат најавете Ñе автоматÑки; не е за компјутери кои ги делите Ñо "
"други!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ја загубивте или заборавивте лозинката?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2331,14 +2347,16 @@ msgstr ""
"Поради безбедноÑни причини треба повторно да го внеÑете Вашето кориÑничко "
"име и лозинка пред да ги Ñмените Вашите нагодувања."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Ðајавете Ñе Ñо кориÑничко име и лозинка."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Ðајавете Ñе Ñо Вашето кориÑничко име и лозинка. Сè уште немате кориÑничко "
-"име? [РегиÑтрирајте](%%action.register%%) нова Ñметка."
+"Сè уште немате кориÑничко име? [Ðаправете](%%action.register%%) нова Ñметка."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2470,8 +2488,8 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
"Рзошто не [региÑтрирате Ñметка](%%%%action.register%%%%) и Ñтанете првиот "
-"што ќе [објави нешто на оваа тема](%%%%action.newnotice%%%%?status_textarea="
-"%s)!"
+"што ќе [објави нешто на оваа тема](%%%%action.newnotice%%%%?status_textarea=%"
+"s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2541,30 +2559,30 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
"Развивачите можат да ги нагодат региÑтрациÑките поÑтавки за нивните програми "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Забелешката нема профил."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Содржините од типот %s не Ñе поддржани."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Ве молиме кориÑтете Ñамо %s URL-адреÑи врз проÑÑ‚ HTTP-код."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -2669,7 +2687,7 @@ msgid "6 or more characters"
msgstr "6 или повеќе знаци"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Потврди"
@@ -2681,11 +2699,11 @@ msgstr "ИÑто како лозинката погоре"
msgid "Change"
msgstr "Промени"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Лозинката мора да Ñодржи барем 6 знаци."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Лозинките не Ñе Ñовпаѓаат."
@@ -2706,13 +2724,13 @@ msgid "Password saved."
msgstr "Лозинката е зачувана."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Патеки"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr "Ðагодувања за патеки и Ñервери за оваа StatusNet веб-Ñтраница."
+msgstr "Ðагодувања за патеки и опÑлужувачи за оваа StatusNet мрежно меÑто."
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2736,11 +2754,11 @@ msgstr "Директориумот на локалите е нечитлив: %s
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr "Ðеважечки SSL-Ñервер. Дозволени Ñе најмногу 255 знаци"
+msgstr "Ðеважечки SSL-опÑлужувач. Дозволени Ñе најмногу до 255 знаци"
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
msgid "Site"
-msgstr "Веб-Ñтраница"
+msgstr "Мреж. меÑто"
#: actions/pathsadminpanel.php:238
msgid "Server"
@@ -2748,7 +2766,7 @@ msgstr "ОпÑлужувач"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr "Име на домаќинот на Ñерверот на веб-Ñтраницата"
+msgstr "Ðазив на домаќинот на опÑлужувачот на мрежното меÑто"
#: actions/pathsadminpanel.php:242
msgid "Path"
@@ -2756,7 +2774,7 @@ msgstr "Патека"
#: actions/pathsadminpanel.php:242
msgid "Site path"
-msgstr "Патека на веб-Ñтраницата"
+msgstr "Патека на мрежното меÑто"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
@@ -2776,11 +2794,11 @@ msgstr "Да кориÑтам интереÑни (почитливи и повп
#: actions/pathsadminpanel.php:259
msgid "Theme"
-msgstr "Тема"
+msgstr "Изглед"
#: actions/pathsadminpanel.php:264
msgid "Theme server"
-msgstr "Сервер на темата"
+msgstr "OпÑлужувач на темата"
#: actions/pathsadminpanel.php:268
msgid "Theme path"
@@ -2796,7 +2814,7 @@ msgstr "Ðватари"
#: actions/pathsadminpanel.php:284
msgid "Avatar server"
-msgstr "Сервер на аватарот"
+msgstr "ОпÑлужувач на аватарот"
#: actions/pathsadminpanel.php:288
msgid "Avatar path"
@@ -2812,7 +2830,7 @@ msgstr "Позадини"
#: actions/pathsadminpanel.php:305
msgid "Background server"
-msgstr "Сервер на позаднината"
+msgstr "OпÑлужувач на позаднината"
#: actions/pathsadminpanel.php:309
msgid "Background path"
@@ -2848,11 +2866,11 @@ msgstr "Кога Ñе кориÑти SSL"
#: actions/pathsadminpanel.php:335
msgid "SSL server"
-msgstr "SSL-Ñервер"
+msgstr "SSL-опÑлужувач"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr "Сервер, кому ќе му Ñе иÑпраќаат SSL-барања"
+msgstr "OпÑлужувач, кому ќе му Ñе иÑпраќаат SSL-барања"
#: actions/pathsadminpanel.php:352
msgid "Save paths"
@@ -2890,8 +2908,8 @@ msgstr "Ðеважечка Ñодржина на забелешката."
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Лиценцата на забелешката „%1$s“ не е компатибилна Ñо лиценцата на веб-"
-"Ñтраницата „%2$s“."
+"Лиценцата на забелешката „%1$s“ не е Ñоодветна на лиценцата на мрежното "
+"меÑто „%2$s“."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2912,43 +2930,43 @@ msgstr "Информации за профил"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 мали букви или бројки. Без интерпукциÑки знаци и празни меÑта."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Цело име"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Домашна Ñтраница"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL на Вашата домашна Ñтраница, блог или профил на друга веб-Ñтраница."
+msgstr "URL на Вашата домашна Ñтраница, блог или профил на друго мрежно меÑто."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишете Ñе ÑебеÑи и Ñвоите интереÑи во %d знаци."
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишете Ñе ÑебеÑи и Вашите интереÑи"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Биографија"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Локација"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Каде Ñе наоѓате, на пр. „Град, ОблаÑÑ‚, Земја“."
@@ -2992,7 +3010,7 @@ msgstr ""
"ÐвтоматÑки претплаќај ме на Ñекој што Ñе претплаќа на мене (најдобро за "
"ботови и Ñл.)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е преголема (највеќе до %d знаци)."
@@ -3089,10 +3107,10 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Ова е %%site.name%%, веб-Ñтраница за [микроблогирање](http://mk.wikipedia."
-"org/wiki/Микроблогирање) базирана на Ñлободната програмÑка алатка [StatusNet]"
-"(http://status.net/). [Зачленете Ñе](%%action.register%%) за да Ñи "
-"Ñподелувате забелешки за Ñебе Ñо приајтелите, ÑемејÑтвото и колегите! "
+"Ова е %%site.name%%, мрежно меÑто за [микроблогирање](http://mk.wikipedia."
+"org/wiki/Микроблогирање) заÑнована на Ñлободната програмÑка алатка "
+"[StatusNet](http://status.net/). [Зачленете Ñе](%%action.register%%) за да "
+"Ñи Ñподелувате забелешки за Ñебе Ñо приајтелите, ÑемејÑтвото и колегите! "
"([Прочитајте повеќе](%%doc.help%%))"
#: actions/public.php:247
@@ -3102,9 +3120,9 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Ова е %%site.name%%, веб-Ñтраница за [микроблогирање](http://mk.wikipedia."
-"org/wiki/Микроблогирање) базирана на Ñлободната програмÑка алатка [StatusNet]"
-"(http://status.net/)."
+"Ова е %%site.name%%, мрежно меÑто за [микроблогирање](http://mk.wikipedia."
+"org/wiki/Микроблогирање) заÑнована на Ñлободната програмÑка алатка "
+"[StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -3188,7 +3206,7 @@ msgstr "Прекар или е-поштенÑка адреÑа"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
msgstr ""
-"Вашиот прекар на овој Ñервер или адреÑата за е-пошта Ñо која Ñе "
+"Вашиот прекар на овој опÑлужувач или адреÑата за е-пошта Ñо која Ñе "
"региÑтриравте."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
@@ -3255,7 +3273,7 @@ msgstr "Лозинката мора да биде од најмалку 6 зна
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не Ñе Ñовпаѓаат."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Грешка во поÑтавувањето на кориÑникот."
@@ -3263,39 +3281,39 @@ msgstr "Грешка во поÑтавувањето на кориÑникот."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовата лозинка е уÑпешно зачувана. Сега Ñте најавени."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Жалиме, региÑтрацијата е Ñамо Ñо покана."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Жалиме, неважечки код за поканата."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "РегиÑтрацијата е уÑпешна"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑтрирај Ñе"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "РегиÑтрирањето не е дозволено."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Ðе може да Ñе региÑтрирате ако не ја прифаќате лиценцата."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "ÐдреÑата веќе поÑтои."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Погрешно име или лозинка."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3303,35 +3321,59 @@ msgstr ""
"Со овој образец можете да Ñоздадете нова Ñметка. Потоа ќе можете да "
"објавувате забелешки и да Ñе поврзувате Ñо пријатели и колеги. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 мали букви или бројки, без интерпункциÑки знаци и празни меÑта. "
"Задолжително поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Барем 6 знаци. Задолжително поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "ИÑто што и лозинката погоре. Задолжително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Е-пошта"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Се кориÑти Ñамо за подновувања, објави и повраќање на лозинка."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Подолго име, по можноÑÑ‚ Вашето виÑтинÑко име и презиме"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr "Сфаќам дека Ñодржината и податоците на %1$s Ñе лични и доверливи."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "ÐвторÑкото правво на мојот текÑÑ‚ и податотеки го има %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+"ÐˆÐ°Ñ Ñ˜Ð° задржувам ÑопÑтвеноÑта на авторÑкото право врз мојот текÑÑ‚ и "
+"податотеки."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Сите права задржани."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3340,7 +3382,7 @@ msgstr ""
"Мојот текÑÑ‚ и податотеки Ñе доÑтапни под %s, оÑвен Ñледниве приватни "
"податоци: лозинка, е-пошта, IM-адреÑа и телефонÑки број."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3374,7 +3416,7 @@ msgstr ""
"Ви благодариме што Ñе зачленивте и Ви пожелуваме пријатни мигови Ñо оваа "
"Ñлужба."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3389,10 +3431,10 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
-"За да Ñе претплатите, може да Ñе [најавите](%%action.login%%) или да "
+"За да Ñе претплатите, можете да Ñе [најавите](%%action.login%%) или да "
"[региÑтрирате](%%action.register%%) нова Ñметка. Ðко веќе имате Ñметка на "
-"[компатибилна веб-Ñтраница за микроблогирање](%%doc.openmublog%%), внеÑете "
-"го URL-то на Вашиот профил подолу."
+"[уÑоглаÑиво мреж. меÑто за микроблогирање](%%doc.openmublog%%), внеÑете го "
+"URL-то на Вашиот профил подолу."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
@@ -3416,7 +3458,7 @@ msgstr "URL на профилот"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL на Вашиот профил на друга компатибилна Ñлужба за микроблогирање."
+msgstr "URL на Вашиот профил на друга Ñоодветна Ñлужба за микроблогирање."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
@@ -3457,7 +3499,7 @@ msgstr "Ðе можете да повторувате ÑопÑтвена забÐ
msgid "You already repeated that notice."
msgstr "Веќе ја имате повторено таа забелешка."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Повторено"
@@ -3525,19 +3567,19 @@ msgstr "Одговори на %1$s на %2$s!"
#: actions/revokerole.php:75
msgid "You cannot revoke user roles on this site."
-msgstr "Ðа оваа веб-Ñтраница не можете да одземате кориÑнички улоги."
+msgstr "Ðа ова мрежно меÑто не можете да одземате кориÑнички улоги."
#: actions/revokerole.php:82
msgid "User doesn't have this role."
msgstr "КориÑникот ја нема оваа улога."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
-msgstr "Ðе можете да Ñтавате кориÑници во пеÑочен режим на оваа веб-Ñтраница."
+msgstr "Ðе можете да Ñтавате кориÑници во пеÑочен режим на ова мрежно меÑто."
#: actions/sandbox.php:72
msgid "User is already sandboxed."
@@ -3545,13 +3587,13 @@ msgstr "КориÑникот е веќе во пеÑочен режим."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "СеÑии"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
-msgstr "Ðагодувања на ÑеÑиите за оваа StatusNet веб-Ñтраница."
+msgstr "Ðагодувања на ÑеÑиите за оваа StatusNet-мрежно меÑто."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3572,7 +3614,7 @@ msgstr "Вклучи извод од поправка на грешки за ÑÐ
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
msgid "Save site settings"
-msgstr "Зачувај нагодувања на веб-Ñтраницата"
+msgstr "Зачувај нагодувања на мреж. меÑто"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
@@ -3588,7 +3630,7 @@ msgid "Icon"
msgstr "Икона"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Име"
@@ -3599,7 +3641,7 @@ msgid "Organization"
msgstr "Организација"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "ОпиÑ"
@@ -3796,8 +3838,8 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** е кориÑничка група на %%%%site.name%%%%, веб-Ñтраница за "
-"[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) базирана на "
+"**%s** е кориÑничка група на %%%%site.name%%%%, мрежно меÑто за "
+"[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) заÑнована на "
"Ñлободната програмÑка алатка [StatusNet](http://status.net/). Ðејзините "
"членови Ñи разменуваат кратки пораки за нивниот живот и интереÑи. [Зачленете "
"Ñе](%%%%action.register%%%%) за да Ñтанете дел од оваа група и многу повеќе! "
@@ -3811,8 +3853,8 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** е кориÑничка група на %%%%site.name%%%%, веб-Ñтраница за "
-"[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) базирана на "
+"**%s** е кориÑничка група на %%%%site.name%%%%, мрежно меÑто за "
+"[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) заÑнована на "
"Ñлободната програмÑка алатка [StatusNet](http://status.net/). Ðејзините "
"членови Ñи разменуваат кратки пораки за нивниот живот и интереÑи. "
@@ -3907,8 +3949,8 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** има Ñметка на %%%%site.name%%%%, веб-Ñтраница за [микроблогирање]"
-"(http://mk.wikipedia.org/wiki/Микроблогирање) базирана на Ñлободната "
+"**%s** има Ñметка на %%%%site.name%%%%, мрежно меÑто за [микроблогирање]"
+"(http://mk.wikipedia.org/wiki/Микроблогирање) заÑнована на Ñлободната "
"програмÑка алатка [StatusNet](http://status.net/). [Зачленете Ñе](%%%%action."
"register%%%%) за да можете да ги Ñледите забелешките на **%s** и многу "
"повеќе! ([Прочитајте повеќе](%%%%doc.help%%%%))"
@@ -3920,8 +3962,8 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** има Ñметка на %%%%site.name%%%%, веб-Ñтраница за [микроблогирање]"
-"(http://mk.wikipedia.org/wiki/Микроблогирање) базирана на Ñлободната "
+"**%s** има Ñметка на %%%%site.name%%%%, мрежно меÑто за [микроблогирање]"
+"(http://mk.wikipedia.org/wiki/Микроблогирање) заÑнована на Ñлободната "
"програмÑка алатка [StatusNet](http://status.net/). "
#: actions/showstream.php:305
@@ -3931,7 +3973,7 @@ msgstr "Повторувања на %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr "Ðе можете да замолчувате кориÑници на оваа веб-Ñтраница."
+msgstr "Ðе можете да замолчувате кориÑници на ова мрежно меÑто."
#: actions/silence.php:72
msgid "User is already silenced."
@@ -3939,11 +3981,11 @@ msgstr "КориÑникот е веќе замолчен."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site"
-msgstr "ОÑновни поÑтавки за оваа StatusNet веб-Ñтраница."
+msgstr "ОÑновни поÑтавки за оваа StatusNet-мрежно меÑто."
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr "Должината на името на веб-Ñтраницата не може да изнеÑува нула."
+msgstr "Должината на името на мрежното меÑто не може да изнеÑува нула."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
@@ -3968,11 +4010,11 @@ msgstr "Општи"
#: actions/siteadminpanel.php:224
msgid "Site name"
-msgstr "Име на веб-Ñтраницата"
+msgstr "Име на мрежното меÑто"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr "Името на Вашата веб-Ñтраница, како на пр. „Микроблог на Вашафирма“"
+msgstr "Името на Вашето мрежно меÑто, како на пр. „Микроблог на Вашафирма“"
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -3996,7 +4038,7 @@ msgstr ""
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr "Контактна е-пошта за Вашата веб-Ñтраница"
+msgstr "Контактна е-пошта за Вашето мрежното меÑто"
#: actions/siteadminpanel.php:245
msgid "Local"
@@ -4008,7 +4050,7 @@ msgstr "ОÑновна чаÑовна зона"
#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
-msgstr "Матична чаÑовна зона за веб-Ñтраницата; обично UTC."
+msgstr "Матична чаÑовна зона за мрежното меÑто; обично UTC."
#: actions/siteadminpanel.php:262
msgid "Default language"
@@ -4016,7 +4058,7 @@ msgstr "ОÑновен јазик"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
-msgstr "Јазик на веб-Ñтраницата ако прелиÑтувачот не може да го препознае Ñам"
+msgstr "Јазик на мрежното меÑто ако прелиÑтувачот не може да го препознае Ñам"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -4046,24 +4088,24 @@ msgstr "Објава на Ñтраница"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
-msgstr "Уреди објава за цела веб-Ñтраница"
+msgstr "Уреди објава за цело мрежно меÑто"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
-msgstr "Ðе можам да ја зачувам објавата за веб-Ñтраницата."
+msgstr "Ðе можам да ја зачувам објавата за мрежното меÑто."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "Објавата за цела веб-Ñтраница не треба да Ñодржи повеќе од 255 знаци."
+msgstr "Објавата за цело мрежно меÑто не треба да Ñодржи повеќе од 255 знаци."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr "ТекÑÑ‚ на објавата за веб-Ñтраницата"
+msgstr "ТекÑÑ‚ на објавата за мрежното меÑто"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
-"ТекÑÑ‚ за главна објава по цела веб-Ñтраница (највеќе до 255 знаци; дозволено "
+"ТекÑÑ‚ за главна објава по цело мрежно меÑто (највеќе до 255 знаци; дозволено "
"и HTML)"
#: actions/sitenoticeadminpanel.php:198
@@ -4226,7 +4268,7 @@ msgstr "Ðема внеÑено код"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Снимки"
@@ -4260,7 +4302,8 @@ msgstr "Снимки од податоци"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
-msgstr "Кога да им Ñе иÑпраќаат ÑтатиÑтички податоци на status.net Ñерверите"
+msgstr ""
+"Кога да им Ñе иÑпраќаат ÑтатиÑтички податоци на status.net опÑлужувачите"
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
@@ -4493,8 +4536,8 @@ msgstr "Претплатата е откажана"
msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Лиценцата на потокот на Ñледачот „%1$s“ не е компатибилна Ñо лиценцата на "
-"веб-Ñтраницата „%2$s“."
+"Лиценцата на каналот на Ñледачот „%1$s“ не е Ñоодветна на лиценцата на "
+"мрежното меÑто „%2$s“."
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
@@ -4504,7 +4547,7 @@ msgstr "КориÑник"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr "КориÑнички нагодувања за оваа StatusNet веб-Ñтраница."
+msgstr "КориÑнички нагодувања за ова StatusNet-мрежно меÑто."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
@@ -4579,7 +4622,7 @@ msgstr ""
"за забелешките на овој кориÑник. Ðко не Ñакате да Ñе претплатите, едноÑтавно "
"кликнете на „Одбиј“"
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Лиценца"
@@ -4615,7 +4658,7 @@ msgid ""
"subscription. Your subscription token is:"
msgstr ""
"Претплатата е одобрена, но не е зададена обратна URL-адреÑа. Проверете ги "
-"инÑтрукциите на веб-Ñтраницата за да дознаете како Ñе одобрува претплата. "
+"инÑтрукциите на мрежното меÑто за да дознаете како Ñе одобрува претплата. "
"Жетонот на Вашата претплата е:"
#: actions/userauthorization.php:266
@@ -4629,7 +4672,7 @@ msgid ""
"subscription."
msgstr ""
"Претплатата е одбиена, но не е зададена обратна URL-адреÑа. Проверете ги "
-"инÑтрукциите на веб-Ñтраницата за да дознаете како Ñе одбива претплата во "
+"инÑтрукциите на мрежното меÑто за да дознаете како Ñе одбива претплата во "
"потполноÑÑ‚."
#: actions/userauthorization.php:303
@@ -4710,43 +4753,43 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Подновувања од %1$s на %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-"Оваа веб-Ñтраница работи на %1$s верзија %2$s, ÐвторÑки права 2008-2010 "
+"Ова мрежно меÑто работи на %1$s верзија %2$s, ÐвторÑки права 2008-2010 "
"StatusNet, Inc. и учеÑници."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "УчеÑници"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
-"StatusNet е Ñлободен ÑофтверÑки програм: можете да го редиÑтрибуирате и/или "
-"менувате под уÑловите на Општата јавна лиценца ГÐУ Ðферо Ñпоред одредбите на "
-"Фондацијата за Ñлободен Ñофтвер, верзија 3 на лиценцата, или (по Ваш избор) "
-"било која подоцнежна верзија. "
+"StatusNet е Ñлободен програм: можете да го редиÑтрибуирате и/или менувате "
+"под уÑловите на Општата јавна лиценца ГÐУ Ðферо Ñпоред одредбите на "
+"Фондацијата за Ñлободна програмÑка опрема, верзија 3 на лиценцата, или (по "
+"Ваш избор) било која подоцнежна верзија. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4758,7 +4801,7 @@ msgstr ""
"или ПОГОДÐОСТ ЗРОПРЕДЕЛЕÐРЦЕЛ. Погледајте ја Општата јавна лиценца ГÐУ "
"Ðферо за повеќе подробноÑти. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4767,20 +4810,20 @@ msgstr ""
"Треба да имате добиено примерок од Општата јавна лиценца ГÐУ Ðферо заедно Ñо "
"овој програм. Ðко ја немате, погледајте %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Приклучоци"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Верзија"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4789,13 +4832,13 @@ msgstr ""
"Ðиедна податотека не Ñмее да биде поголема од %d бајти, а подаотеката што ја "
"иÑпративте Ñодржи %d бајти. Подигнете помала верзија."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Волку голема податотека ќе ја надмине Вашата кориÑничка квота од %d бајти."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "ВОлку голема податотека ќе ја надмине Вашата меÑечна квота од %d бајти"
@@ -4834,27 +4877,27 @@ msgid "Could not update message with new URI."
msgstr "Ðе можев да ја подновам пораката Ñо нов URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознаката: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Проблем Ñо зачувувањето на белешката. Премногу долго."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Проблем Ñо зачувувањето на белешката. Ðепознат кориÑник."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Премногу забелњшки за прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4862,21 +4905,21 @@ msgstr ""
"Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
-msgstr "Забрането Ви е да објавувате забелешки на оваа веб-Ñтраница."
+msgstr "Забрането Ви е да објавувате забелешки на ова мрежно меÑто."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4978,188 +5021,188 @@ msgid "Untitled page"
msgstr "Страница без наÑлов"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Главна навигација"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личен профил и хронологија на пријатели"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Промена на е-пошта, аватар, лозинка, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Поврзи Ñе Ñо уÑлуги"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Поврзи Ñе"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr "Промена на поÑтавките на веб-Ñтраницата"
+msgstr "Промена на поÑтавките на мрежното меÑто"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Ðдмин"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете пријатели и колеги да Ви Ñе придружат на %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Одјава"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Одјава"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создај Ñметка"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтрација"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ðајава"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Ðајава"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ðапомош!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Помош"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пребарајте луѓе или текÑÑ‚"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Барај"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
-msgstr "Ðапомена за веб-Ñтраницата"
+msgstr "Ðапомена за мрежното меÑто"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Локални прегледи"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Ðапомена за Ñтраницата"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Споредна навигација"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Помош"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "За"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "ЧПП"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "УÑлови"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "ПриватноÑÑ‚"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Изворен код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Значка"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Лиценца на програмот StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5169,38 +5212,38 @@ msgstr ""
"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** е ÑÐµÑ€Ð²Ð¸Ñ Ð·Ð° микроблогирање."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Работи на [StatusNet](http://status.net/) Ñофтверот за микроблогирање, "
-"верзија %s, доÑтапен пд [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"Работи на [StatusNet](http://status.net/) - програмÑка опрема за "
+"микроблогирање, верзија %s, доÑтапна под [GNU Affero General Public License]"
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
-msgstr "Лиценца на Ñодржините на веб-Ñтраницата"
+msgstr "Лиценца на Ñодржините на мрежното меÑто"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содржината и податоците на %1$s Ñе лични и доверливи."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5208,37 +5251,37 @@ msgstr ""
"права задржани."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвторÑките права на Ñодржината и податоците им припаѓаат на учеÑниците. Сите "
"права задржани."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Сите Ñодржини и податоци на %1$s Ñе доÑтапни под лиценцата %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Пред"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Се очекува коренÑки каналÑки елемент, но добив цел XML документ."
@@ -5246,18 +5289,18 @@ msgstr "Се очекува коренÑки каналÑки елемент, н
msgid "Can't handle remote content yet."
msgstr "Сè уште не е поддржана обработката на далечинÑка Ñодржина."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Сè уште не е поддржана обработката на XML Ñодржина."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Сè уште не е доÑтапна обработката на вметната Base64 Ñодржина."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
msgid "You cannot make changes to this site."
-msgstr "Ðе можете да ја менувате оваа веб-Ñтраница."
+msgstr "Ðе можете да врште измени на ова мрежно меÑто."
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
@@ -5281,64 +5324,64 @@ msgid "Unable to delete design setting."
msgstr "Ðе можам да ги избришам нагодувањата за изглед."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
-msgstr "ОÑновни нагодувања на веб-Ñтраницата"
+msgstr "ОÑновни нагодувања на мрежното меÑто"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
-msgstr "Веб-Ñтраница"
+msgstr "Мреж. меÑто"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
-msgstr "Конфигурација на изгледот"
+msgstr "ПоÑтавки на изгледот"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Изглед"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Конфигурација на кориÑник"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "КориÑник"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Конфигурација на приÑтапот"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Конфигурација на патеки"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Конфигурација на ÑеÑиите"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
-msgstr "Уреди објава за веб-Ñтраницата"
+msgstr "Уреди објава за мрежното меÑто"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "ПоÑтавки за Ñнимки"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-реÑурÑот бара да може и да чита и да запишува, а вие можете Ñамо да "
@@ -5471,11 +5514,11 @@ msgstr "Забелешки кадешто Ñе јавува овој прилоÐ
msgid "Tags for this attachment"
msgstr "Ознаки за овој прилог"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Менувањето на лозинката не уÑпеа"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Менувањето на лозинка не е дозволено"
@@ -5557,7 +5600,7 @@ msgstr "Ðе можев да го зачленам кориÑникот %1$s в
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s."
@@ -5569,14 +5612,14 @@ msgstr "Име и презиме: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Локација: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Домашна Ñтраница: %s"
@@ -5594,7 +5637,7 @@ msgid ""
"same server."
msgstr ""
"%s е далечинÑки профил; можете да праќате директни пораки Ñамо до кориÑници "
-"на иÑтиот Ñервер."
+"на иÑтиот опÑлужувач."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
@@ -5782,9 +5825,9 @@ msgstr ""
"off - иÑклучи извеÑтувања\n"
"help - прикажи ја оваа помош\n"
"follow <nickname> - претплати Ñе на кориÑник\n"
-"groups - лиÑта на групи кадешто членувате\n"
-"subscriptions - лиÑта на луѓе кои ги Ñледите\n"
-"subscribers - лиÑта на луѓе кои ве Ñледат\n"
+"groups - ÑпиÑок на групи кадешто членувате\n"
+"subscriptions - ÑпиÑок на луѓе кои ги Ñледите\n"
+"subscribers - ÑпиÑок на луѓе кои ве Ñледат\n"
"leave <nickname> - откажи претплата на кориÑник\n"
"d <nickname> <text> - директна порака за кориÑник\n"
"get <nickname> - прикажи поÑледна забелешка на кориÑник\n"
@@ -5796,7 +5839,7 @@ msgstr ""
"reply #<notice_id> - одговори на забелешка Ñо даден id\n"
"reply <nickname> - одговори на поÑледна забелешка на кориÑник\n"
"join <group> - зачлени Ñе во група\n"
-"login - Дај врÑка за најавување на веб-интерфејÑот\n"
+"login - Дај врÑка за најавување на поÑредникот\n"
"drop <group> - напушти група\n"
"stats - прикажи мои ÑтатиÑтики\n"
"stop - иÑто што и 'off'\n"
@@ -5920,7 +5963,7 @@ msgstr "Ознака"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr "Одберете ознака за да ја уточните лиÑтата"
+msgstr "Одберете ознака за да го ограничите ÑпиÑокот"
#: lib/galleryaction.php:143
msgid "Go"
@@ -6111,8 +6154,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s Ñега ги Ñледи Вашите забелешки на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Доколку Ñметате дека Ñметкава Ñе злоупотребува, тогаш можете да ја блокирате "
+"од ÑпиÑокот на претплатници и да ја пријавите како Ñпам кај админиÑтраторите "
+"на %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6139,19 +6192,19 @@ msgstr ""
"$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Биографија: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðова е-поштенÑка адреÑа за објавување на %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6173,30 +6226,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð½Ð° %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Потврда за СМС"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: потврдете го како Ñвој телефонÑкиов број Ñо Ñледниов код:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s Ве подбуцна"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6224,13 +6277,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ðова приватна порака од %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6264,13 +6317,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додаде Ваша забелешка како омилена"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6301,7 +6354,7 @@ msgstr ""
"\n"
"%4$s\n"
"\n"
-"Погледнете лиÑта на омилените забелешки на %1$s тука:\n"
+"Погледнете ÑпиÑок на омилените забелешки на %1$s тука:\n"
"\n"
"%5$s\n"
"\n"
@@ -6309,7 +6362,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6320,13 +6373,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) Ви иÑпрати забелешка што Ñака да ја прочитате"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6367,7 +6420,7 @@ msgstr ""
"\n"
"%6$s\n"
"\n"
-"Еве лиÑта за Ñите @-одговори за ваÑ:\n"
+"Еве ÑпиÑок на Ñите @-одговори за ваÑ:\n"
"\n"
"%7$s\n"
"\n"
@@ -6389,7 +6442,7 @@ msgstr ""
"впуштите во разговор Ñо други кориÑници. Луѓето можат да ви иÑпраќаат пораки "
"што ќе можете да ги видите Ñамо Вие."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "од"
@@ -6470,7 +6523,7 @@ msgstr " Обидете Ñе Ñо друг формат на %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr "%s не е поддржан тип на податотека на овој Ñервер."
+msgstr "%s не е поддржан тип на податотека на овој опÑлужувач."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -6551,23 +6604,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "во"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "во контекÑÑ‚"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Повторено од"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Одговори на забелешкава"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Одговор"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Забелешката е повторена"
@@ -6640,7 +6693,7 @@ msgstr "Ваши иÑпратени пораки"
msgid "Tags in %s's notices"
msgstr "Ознаки во забелешките на %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Ðепознато"
@@ -6677,7 +6730,7 @@ msgstr "Дневен проÑек"
msgid "All groups"
msgstr "Сите групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ðеимплементиран метод."
@@ -6701,7 +6754,7 @@ msgstr "Избрани"
msgid "Popular"
msgstr "Популарно"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Ðема return-to аргументи."
@@ -6722,7 +6775,7 @@ msgstr "Повтори ја забелешкава"
msgid "Revoke the \"%s\" role from this user"
msgstr "Одземи му ја улогата „%s“ на кориÑников"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ðе е зададен кориÑник за еднокориÑничкиот режим."
@@ -6736,7 +6789,7 @@ msgstr "Стави го кориÑников во пеÑочен режим"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr "Пребарај по веб-Ñтраницата"
+msgstr "Пребарај по мрежното меÑто"
#: lib/searchaction.php:126
msgid "Keyword(s)"
@@ -6756,7 +6809,7 @@ msgstr "Луѓе"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr "Пронајдете луѓе на оваа веб-Ñтраница"
+msgstr "Пронајдете луѓе на ова мрежно меÑто"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
@@ -6764,7 +6817,7 @@ msgstr "Пронајдете Ñодржини на забелешките"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr "Пронајдете групи на оваа веб-Ñтраница"
+msgstr "Пронајдете групи на ова мрежно меÑто"
#: lib/section.php:89
msgid "Untitled section"
@@ -6820,6 +6873,52 @@ msgstr "Облак од ознаки за луѓе"
msgid "None"
msgstr "Без ознаки"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"ОпÑлужувачот не може да Ñе Ñправи Ñо подигања на изгледи без ZIP-поддршка."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Подигањето на мотивот недоÑтаÑува или не уÑпеа."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Зачувувањето на мотивот не уÑпеа."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Ðеважечки изглед: лош ÑоÑтав на папката."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Подигнатиот изглед е преголем; мора да биде помал од %d бајти (незбиен)."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Ðеважечки архив за изглеедот: недоÑтаÑува податотеката css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Изгледот Ñодржи неважечки назив на податотека или папка. Дозволени Ñе Ñамо "
+"ASCII-букви, бројки, долна црта и знак за минуÑ."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "Изгледот Ñодржи податотека од типот „.%s“, која не е дозволена."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Грешка при отворањето на архивот за мотив."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Ðајактивни објавувачи"
@@ -6900,56 +6999,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "пред неколку Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "пред еден чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "пред %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
-msgstr "пред %d денови"
+msgstr "пред %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "пред еден меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "пред %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 178ed2de8..112ca76c8 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:23+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:30+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Tilgang"
@@ -84,25 +84,24 @@ msgid "Save"
msgstr "Lagre"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Ingen slik side"
+msgstr "Ingen slik side."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -115,7 +114,7 @@ msgid "No such user."
msgstr "Ingen slik bruker"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s og venner, side %2$d"
@@ -123,39 +122,39 @@ msgstr "%1$s og venner, side %2$d"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s og venner"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Mating for venner av %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Mating for venner av %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Mating for venner av %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -165,7 +164,7 @@ msgstr ""
"eller post noe selv."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -175,7 +174,7 @@ msgstr ""
"å få hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,66 +184,65 @@ msgstr ""
"eller post en notis for å få hans eller hennes oppmerksomhet."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Du og venner"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringer fra %1$s og venner på %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metode ikke funnet!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Denne metoden krever en POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
-msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none"
+msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Klarte ikke å oppdatere bruker."
@@ -266,7 +264,7 @@ msgstr "Klarte ikke å lagre profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -326,41 +324,41 @@ msgstr "Direktemeldinger til %s"
msgid "All the direct messages sent to %s"
msgstr "Alle direktemeldinger sendt til %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Ingen meldingstekst!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Dette er for langt. Meldingen kan bare være %d tegn lang."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Fant ikke mottakeren."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Fant ingen status med den ID-en."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Denne statusen er allerede en favoritt."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Kunne ikke opprette favoritt."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Den statusen er ikke en favoritt."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Kunne ikke slette favoritt."
@@ -393,120 +391,119 @@ msgstr "Kunne ikke bestemme kildebruker."
msgid "Could not find target user."
msgstr "Kunne ikke finne målbruker."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Det nicket er allerede i bruk. Prøv et annet."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ugyldig nick."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Hjemmesiden er ikke en gyldig URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Beklager, navnet er for langt (max 250 tegn)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Beskrivelsen er for lang (maks %d tegn)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Plassering er for lang (maks 255 tegn)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "For mange alias! Maksimum %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Ugyldig alias: «%s»"
+msgstr "Ugyldig alias: «%s»."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias kan ikke være det samme som kallenavn."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "Gruppe ikke funnet!"
+msgstr "Gruppe ikke funnet."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Du er allerede medlem av den gruppen."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Du har blitt blokkert fra den gruppen av administratoren."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Du er ikke et medlem av denne gruppen."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s sine grupper"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s grupper %2$s er et medlem av."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s grupper"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "grupper på %s"
@@ -521,15 +518,15 @@ msgstr "Ugyldig symbol."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -593,12 +590,12 @@ msgstr ""
"$s-konto til tredjeparter du stoler på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -606,8 +603,8 @@ msgid "Nickname"
msgstr "Nick"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passord"
@@ -623,11 +620,11 @@ msgstr "Tillat"
msgid "Allow or deny access to your account information."
msgstr "Tillat eller nekt tilgang til din kontoinformasjon."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Denne metoden krever en POST eller DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Du kan ikke slette statusen til en annen bruker."
@@ -644,25 +641,25 @@ msgstr "Kan ikke gjenta din egen notis."
msgid "Already repeated that notice."
msgstr "Allerede gjentatt den notisen."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Status slettet."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Ingen status med den ID-en funnet."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det er for langt. Maks notisstørrelse er %d tegn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ikke funnet."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
@@ -671,32 +668,32 @@ msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
msgid "Unsupported format."
msgstr "Formatet støttes ikke."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritter fra %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Oppdateringer som nevner %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentlig tidslinje"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringer fra alle sammen!"
@@ -711,12 +708,12 @@ msgstr "Gjentatt til %s"
msgid "Repeats of %s"
msgstr "Repetisjoner av %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notiser merket med %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringer merket med %1$s på %2$s!"
@@ -765,7 +762,7 @@ msgstr "Avatarinnstillinger"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
#: actions/grouplogo.php:202 actions/grouplogo.php:262
msgid "Original"
-msgstr "Original"
+msgstr "Opprinnelig"
#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
#: actions/grouplogo.php:213 actions/grouplogo.php:274
@@ -773,7 +770,7 @@ msgid "Preview"
msgstr "Forhåndsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Slett"
@@ -813,11 +810,11 @@ msgstr "Avatar slettet."
msgid "You already blocked that user."
msgstr "Du har allerede blokkert den brukeren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukeren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -832,17 +829,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ikke blokker denne brukeren"
@@ -851,20 +847,19 @@ msgstr "Ikke blokker denne brukeren"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokker denne brukeren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Kunne ikke lagre blokkeringsinformasjon."
@@ -910,9 +905,9 @@ msgstr "Opphev blokkering av denne brukeren"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Post til "
+msgstr "Post til %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -928,9 +923,9 @@ msgstr "Den bekreftelseskoden er ikke til deg."
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Ukjent adressetype %s"
+msgstr "Ukjent adressetype %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -991,7 +986,7 @@ msgstr "Du er ikke eieren av dette programmet."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1025,7 +1020,7 @@ msgstr "Slett dette programmet"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ikke logget inn."
@@ -1056,7 +1051,7 @@ msgid "Do not delete this notice"
msgstr "Ikke slett denne notisen"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1090,51 +1085,60 @@ msgstr "Slett denne brukeren"
#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
#: lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Utseende"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Utseendeinnstillinger for dette StatusNet-nettstedet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Ugyldig logo-URL."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema ikke tilgjengelig: %s"
+msgstr "Tema ikke tilgjengelig: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Endre logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Nettstedslogo"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Endre tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Nettstedstema"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema for nettstedet."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Nettstedstema"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Endre bakgrunnsbilde"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Bakgrunn"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1143,57 +1147,65 @@ 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:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "PÃ¥"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Av"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Slå på eller av bakgrunnsbilde."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Gjenta bakgrunnsbildet"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Endre farger"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Innhold"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidelinje"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Lenker"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Bruk standard"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Gjenopprett standardutseende"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Tilbakestill til standardverdier"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1203,9 +1215,9 @@ msgstr "Tilbakestill til standardverdier"
msgid "Save"
msgstr "Lagre"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Lagre utseende"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -1356,7 +1368,6 @@ msgstr "Nåværende bekreftede e-postadresse"
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjern"
@@ -1375,7 +1386,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
@@ -1390,7 +1400,6 @@ msgstr "E-postadresse («brukernavn@eksempel.org»)"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Legg til"
@@ -1416,16 +1425,14 @@ msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle."
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Innstillinger"
+msgstr "E-postinnstillinger"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1464,9 +1471,8 @@ msgstr "Publiser en MicroID for min e-postadresse."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Innstillinger lagret."
+msgstr "E-postinnstillinger lagret."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1479,7 +1485,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
@@ -1521,15 +1527,13 @@ msgstr "Ingen ventende bekreftelse å avbryte."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Det er feil IM-adresse."
+msgstr "Dette er feil e-postadresse."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+msgstr "E-postbekreftelse avbrutt."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1539,9 +1543,8 @@ msgstr "Det er ikke din e-postadresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Adressen ble fjernet."
+msgstr "E-postadressen ble fjernet."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1552,7 +1555,7 @@ msgstr "Ingen innkommende e-postadresse."
#: actions/emailsettings.php:504 actions/emailsettings.php:528
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
-msgstr ""
+msgstr "Kunne ikke oppdatere brukeroppføring."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:508 actions/smssettings.php:581
@@ -1618,17 +1621,17 @@ msgstr "%s sine favorittnotiser"
#: actions/favoritesrss.php:115
#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
+msgstr "Oppdateringer markert som favoritt av %1$s på %2$s!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
msgid "Featured users"
-msgstr ""
+msgstr "Profilerte brukere"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "Profilerte brukere, side %d"
#: actions/featured.php:99
#, php-format
@@ -1653,19 +1656,19 @@ msgstr "Ingen opplastede vedlegg."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
-msgstr ""
+msgstr "Forventet ikke denne responsen!"
#: actions/finishremotesubscribe.php:80
msgid "User being listened to does not exist."
-msgstr ""
+msgstr "Brukeren som lyttes til finnes ikke."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr ""
+msgstr "Du kan bruke det lokale abonnementet!"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Brukeren har blokkert deg fra å abonnere."
#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
@@ -1677,12 +1680,11 @@ msgstr ""
#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
+msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Feil ved repetering av notis."
+msgstr "Feil ved oppdatering av fjernprofil."
#: actions/getfile.php:79
msgid "No such file."
@@ -1710,13 +1712,13 @@ msgstr "Bruker har allerede denne rollen."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil oppgitt."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med den ID'en."
@@ -1727,7 +1729,7 @@ msgstr "Ingen gruppe oppgitt."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Bare en admin kan blokkere gruppemedlemmer."
#: actions/groupblock.php:95
msgid "User is already blocked from group."
@@ -1748,6 +1750,9 @@ msgid ""
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
+"Er du sikker på at du vil blokkere brukeren «%1$s» fra gruppen «%2$s»? De vil "
+"bli fjernet fra gruppen, kan ikke poste og kan ikke abonnere på gruppen i "
+"fremtiden."
#. TRANS: Submit button title for 'No' when blocking a user from a group.
#: actions/groupblock.php:182
@@ -1761,7 +1766,7 @@ msgstr "Blokker denne brukeren fra denne gruppen"
#: actions/groupblock.php:206
msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Databasefeil ved blokkering av bruker fra gruppe."
#: actions/groupbyid.php:74 actions/userbyid.php:70
msgid "No ID."
@@ -1769,27 +1774,28 @@ msgstr "Ingen ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "Du må være logget inn for å redigere en gruppe."
#: actions/groupdesignsettings.php:144
msgid "Group design"
-msgstr ""
+msgstr "Gruppeutseende"
#: actions/groupdesignsettings.php:155
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
+"av ditt valg."
#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
msgid "Couldn't update your design."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke oppdatere utseende."
#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
msgid "Design preferences saved."
-msgstr ""
+msgstr "Utseende lagret."
#: actions/grouplogo.php:142 actions/grouplogo.php:195
msgid "Group logo"
@@ -1803,7 +1809,7 @@ msgstr "Du kan laste opp en logo for gruppen din. Maks filstørrelse er %s."
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "Velg et kvadratisk område av bildet som skal bli logoen."
#: actions/grouplogo.php:399
msgid "Logo updated."
@@ -1851,7 +1857,7 @@ msgstr "Gjør denne brukeren til administrator"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s tidslinje"
@@ -1924,10 +1930,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%) og [opprette gruppen]"
+"(%%action.newgroup%%) selv!"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Bare en admin kan oppheve blokkering av gruppemedlemmer."
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
@@ -1951,11 +1959,13 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
+"Du kan sende og motta notiser gjennom Jabber/GTalk [direktemeldinger](%%doc."
+"im%%). Konfigurer adresse og innstillinger under."
#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
#: actions/imsettings.php:94
msgid "IM is not available."
-msgstr ""
+msgstr "Direktemeldinger ikke tilgjengelig."
#. TRANS: Form legend for IM settings form.
#. TRANS: Field label for IM address input in IM settings form.
@@ -1986,27 +1996,28 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
+"Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s til "
+"vennelisten din i direktemeldingsklienten din eller på GTalk."
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Innstillinger"
+msgstr "Direktemeldingsinnstillinger"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
-msgstr ""
+msgstr "Send meg notiser gjennom Jabber/GTalk."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Post en notis når min Jabber/Gtalk-status endres."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
+msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:179
@@ -2041,7 +2052,7 @@ msgstr "Det er allerede din Jabber ID."
#. TRANS: Message given saving IM address that is already set for another user.
#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
-msgstr ""
+msgstr "Jabber-ID tilhører allerede en annen bruker."
#. TRANS: Message given saving valid IM address that is to be confirmed.
#. TRANS: %s is the IM address set for the site.
@@ -2061,15 +2072,13 @@ msgstr "Det er feil IM-adresse."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Kunne ikke slette e-postbekreftelse."
+msgstr "Kunne ikke slette direktemeldingsbekreftelse."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+msgstr "Direktemeldingsbekreftelse avbrutt."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2079,9 +2088,8 @@ msgstr "Det er ikke din Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Adressen ble fjernet."
+msgstr "Direktemeldingsadressen ble fjernet."
#: actions/inbox.php:59
#, php-format
@@ -2103,9 +2111,9 @@ msgid "Invites have been disabled."
msgstr "Invitasjoner har blitt deaktivert."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s"
+msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s."
#: actions/invite.php:72
#, php-format
@@ -2122,7 +2130,7 @@ msgstr "Inviter nye brukere"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Du abonnerer allerede på disse brukerne:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -2135,6 +2143,7 @@ msgstr "%1$s (%2$s)"
msgid ""
"These people are already users and you were automatically subscribed to them:"
msgstr ""
+"Disse personene er allerede brukere og du ble automatisk abonnent på dem:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
@@ -2145,11 +2154,15 @@ msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr ""
+"Du vil bli varslet når dine inviterte aksepterer invitasjonen og registrerer "
+"seg på nettstedet. Takk for at du hjelper oss å vokse!"
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
+"Bruk dette skjemaet for å invitere dine venner og kollegaer til å bruke "
+"denne tjenesten."
#: actions/invite.php:187
msgid "Email addresses"
@@ -2165,7 +2178,7 @@ msgstr "Personlig melding"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Om du vil kan du legge til en personlig melding i invitasjonen."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
@@ -2262,54 +2275,57 @@ msgstr "Du er ikke et medlem av den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s forlot gruppe %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allerede innlogget."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
-#: actions/login.php:132 actions/otp.php:120
-#, fuzzy
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
-msgstr "Ikke autorisert."
+msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logg inn på nettstedet"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mistet eller glemt passordet?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
+"Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
+"endrer innstillingene dine."
+
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Logg inn med brukernavn og passord."
-#: actions/login.php:270
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Logg inn med ditt brukernavn og passord. Har du ikke et brukernavn ennå? "
-"[Opprett](%%action.register%%) en ny konto."
+"Har du ikke et brukernavn ennå? [Opprett](%%action.register%%) en ny konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2321,9 +2337,9 @@ msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s er allerede en administrator for gruppen «%2$s»."
#: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kan ikke hente medlemsoppføring for %$1s i gruppen %2$s."
#: actions/makeadmin.php:146
#, php-format
@@ -2331,9 +2347,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Ingen nåværende status"
+msgstr "Ingen nåværende status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2341,20 +2356,19 @@ msgstr "Nytt program"
#: actions/newapplication.php:64
msgid "You must be logged in to register an application."
-msgstr ""
+msgstr "Du må være logget inn for å registrere et program."
#: actions/newapplication.php:143
msgid "Use this form to register a new application."
-msgstr ""
+msgstr "Bruk dette skjemaet for å registrere et nytt program."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "Nettadresse til kilde kreves."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke opprette program."
#: actions/newgroup.php:53
msgid "New group"
@@ -2385,6 +2399,7 @@ msgstr "Ingen mottaker oppgitt."
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
+"Ikke send en melding til degselv; bare hvisk det stille til degselv istedet."
#: actions/newmessage.php:181
msgid "Message sent"
@@ -2413,6 +2428,8 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
+"Søk i notiser på %%site.name%% etter deres innhold. Separer nøkkelord med "
+"mellomrom; de må være minst 3 tegn lange."
#: actions/noticesearch.php:78
msgid "Text search"
@@ -2429,6 +2446,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -2436,6 +2455,9 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%%%action.register%%%%) og vær den "
+"første til å [poste om dette emnet](%%%%action.newnotice%%%%?status_textarea="
+"%s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2464,7 +2486,7 @@ msgstr "Knuff sendt!"
#: actions/oauthappssettings.php:59
msgid "You must be logged in to list your applications."
-msgstr ""
+msgstr "Du må være logget inn for å liste opp programmene dine."
#: actions/oauthappssettings.php:74
msgid "OAuth applications"
@@ -2472,16 +2494,16 @@ msgstr "OAuth-program"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Program du har registrert"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Du har ikke registrert noen program ennå."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Tilkoblede program"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
@@ -2492,9 +2514,9 @@ msgid "You are not a user of that application."
msgstr "Du er ikke bruker av dette programmet."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Kunne ikke tilbakekalle tilgang for programmet: "
+msgstr "Kunne ikke tilbakekalle tilgang for programmet: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2502,33 +2524,32 @@ msgstr "Du har ikke tillatt noen programmer å bruke din konto."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
-msgstr ""
+msgstr "Utviklere kan redigere registreringsinnstillingene for sine program "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Brukeren har ingen profil."
+msgstr "Notisen har ingen profil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "innholdstype "
+msgstr "Innholdstypen %s støttes ikke."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Bare %s-nettadresser over vanlig HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Ikke et støttet dataformat."
@@ -2546,7 +2567,7 @@ msgstr "Andre innstillinger"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr ""
+msgstr "HÃ¥ndter diverse andre alternativ."
#: actions/othersettings.php:108
msgid " (free service)"
@@ -2554,24 +2575,23 @@ msgstr " (gratis tjeneste)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Forkort nettadresser med"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Automatisk fortkortelsestjeneste å bruke."
#: actions/othersettings.php:122
msgid "View profile designs"
-msgstr ""
+msgstr "Vis profilutseender"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Vis eller skjul profilutseender."
#: actions/othersettings.php:153
-#, fuzzy
msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
+msgstr "Navnet på nettadresseforkortelsestjenesten er for lang (maks 50 tegn)."
#: actions/otp.php:69
msgid "No user ID specified."
@@ -2634,7 +2654,7 @@ msgid "6 or more characters"
msgstr "6 eller flere tegn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bekreft"
@@ -2646,11 +2666,11 @@ msgstr "Samme som passord ovenfor"
msgid "Change"
msgstr "Endre"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 tegn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passordene var ikke like."
@@ -2671,33 +2691,33 @@ msgid "Password saved."
msgstr "Passordet ble lagret"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
-msgstr ""
+msgstr "Stier"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Sti- og tjenerinnstillinger for dette StatusNet-nettstedet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Tema ikke tilgjengelig: %s"
+msgstr "Temamappe ikke lesbar: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Avatarmappe"
+msgstr "Avatarmappe ikke skrivbar: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Bakgrunnsmappe"
+msgstr "Bakgrunnsmappe ikke skrivbar: %s."
#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s."
-msgstr ""
+msgstr "Lokaliseringsmappe ikke lesbar: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2717,27 +2737,27 @@ msgstr "Vertsnavn for nettstedets tjener."
#: actions/pathsadminpanel.php:242
msgid "Path"
-msgstr ""
+msgstr "Sti"
#: actions/pathsadminpanel.php:242
msgid "Site path"
-msgstr ""
+msgstr "Nettstedssti"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr ""
+msgstr "Lokaliseringssti"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
-msgstr ""
+msgstr "Lokaliseringsmappesti"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr ""
+msgstr "Pyntede nettadresser"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2821,7 +2841,7 @@ msgstr "Tjener SSL-forespørsler skal vises til"
#: actions/pathsadminpanel.php:352
msgid "Save paths"
-msgstr ""
+msgstr "Lagre stier"
#: actions/peoplesearch.php:52
#, php-format
@@ -2837,24 +2857,23 @@ msgid "People search"
msgstr "Personsøk"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Ugyldig e-postadresse"
+msgstr "Ikke en gyldig personmerkelapp: %s."
#: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Mikroblogg av %s"
+msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Ugyldig symbol."
+msgstr "Ugyldig notisinnhold."
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
+msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2875,49 +2894,49 @@ msgstr "Profilinformasjon"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt navn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmesiden"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beskriv degselv og dine interesser med %d tegn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beskriv degselv og dine interesser"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Om meg"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
-msgstr ""
+msgstr "Plassering"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Del min nåværende plassering når jeg poster notiser"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2929,6 +2948,8 @@ msgstr "Tagger"
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
+"eller mellomrom"
#: actions/profilesettings.php:151
msgid "Language"
@@ -2952,7 +2973,7 @@ msgid ""
msgstr ""
"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks %d tegn)."
@@ -2966,27 +2987,25 @@ msgid "Language is too long (max 50 chars)."
msgstr "Språk er for langt (maks 50 tegn)."
#: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig hjemmeside '%s'"
+msgstr "Ugyldig merkelapp: «%s»"
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Kunne ikke oppdatere bruker for autoabonnering."
#: actions/profilesettings.php:363
-#, fuzzy
msgid "Couldn't save location prefs."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Kunne ikke lagre plasseringsinnstillinger."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Klarte ikke å lagre profil."
#: actions/profilesettings.php:383
-#, fuzzy
msgid "Couldn't save tags."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Kunne ikke lagre merkelapper."
#. TRANS: Message after successful saving of administrative settings.
#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
@@ -2994,9 +3013,9 @@ msgid "Settings saved."
msgstr "Innstillinger lagret."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Over sidegrensen (%s)"
+msgstr "Over sidegrensen (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3005,11 +3024,11 @@ msgstr "Kunne ikke hente offentlig strøm."
#: actions/public.php:130
#, php-format
msgid "Public timeline, page %d"
-msgstr ""
+msgstr "Offentlig tidslinje, side %d"
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr ""
+msgstr "Offentlig tidslinje"
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
@@ -3029,16 +3048,20 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Dette er den offentlige tidslinjen for %%site.name%% men ingen har postet "
+"noe ennå."
#: actions/public.php:191
msgid "Be the first to post!"
-msgstr ""
+msgstr "Vær den første til å poste!"
#: actions/public.php:195
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
+"til å poste!"
#: actions/public.php:242
#, php-format
@@ -3048,6 +3071,10 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/"
+"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
+"(http://status.net). [Bli med nå](%%action.register%%) for å dele notiser om "
+"degselv med venner, familie og kollegaer! ([Les mer](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3056,15 +3083,18 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/"
+"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
+"(http://status.net)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr ""
+msgstr "Offentlig merkelappsky"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Dette er de siste mest populære merkelappene på %s "
#: actions/publictagcloud.php:69
#, php-format
@@ -3073,7 +3103,7 @@ msgstr ""
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Vær den første til å poste en!"
#: actions/publictagcloud.php:75
#, php-format
@@ -3081,10 +3111,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
+"til å poste en!"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
-msgstr ""
+msgstr "Merkelappsky"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -3092,15 +3124,15 @@ msgstr "Du er allerede logget inn!"
#: actions/recoverpassword.php:62
msgid "No such recovery code."
-msgstr ""
+msgstr "Ingen slik gjenopprettingskode."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
-msgstr ""
+msgstr "Ikke en gjenopprettingskode."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Gjenopprettingskode for ukjent bruker."
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
@@ -3119,22 +3151,24 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"Om du har glemt eller mistet passordet ditt kan du få et nytt tilsendt på e-"
+"postadressen du har lagret på kontoen din."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Passordgjenoppretting"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Kallenavn eller e-postadresse"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "Ditt kallenavn på denne tjeneren eller din registrerte e-postadresse."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -3142,15 +3176,15 @@ msgstr "Gjenopprett"
#: actions/recoverpassword.php:208
msgid "Reset password"
-msgstr ""
+msgstr "Tilbakestill passord"
#: actions/recoverpassword.php:209
msgid "Recover password"
-msgstr ""
+msgstr "Gjenopprett passord"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
-msgstr ""
+msgstr "Passordgjenoppretting forespurt"
#: actions/recoverpassword.php:213
msgid "Unknown action"
@@ -3166,19 +3200,19 @@ msgstr "Nullstill"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr ""
+msgstr "Skriv inn et kallenavn eller en e-postadresse."
#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
-msgstr ""
+msgstr "Ingen bruker med den e-postadressen eller det kallenavnet."
#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr ""
+msgstr "Ingen registrert e-postadresse for den brukeren."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Feil ved lagring av adressebekreftelse."
#: actions/recoverpassword.php:338
msgid ""
@@ -3190,7 +3224,7 @@ msgstr ""
#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
-msgstr ""
+msgstr "Uventet tilbakestilling av passord."
#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
@@ -3198,91 +3232,115 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Passord og bekreftelse samsvarer ikke."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
-msgstr ""
+msgstr "Feil ved innstilling av bruker."
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Nytt passord ble lagret. Du er nå logget inn."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Beklager, kun inviterte personer kan registrere seg."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
-msgstr ""
+msgstr "Beklager, ugyldig invitasjonskode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
-msgstr ""
+msgstr "Registrering vellykket"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
-msgstr ""
+msgstr "Registrer"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
-msgstr ""
+msgstr "Registrering ikke tillatt."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-postadressen finnes allerede."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
+"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
+"knytte deg til venner og kollegaer. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eller flere tegn. PÃ¥krevd."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samme som passord over. Kreves."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-post"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-" utenom disse private dataene: passord, e-postadresse, lynmeldingsadresse "
-"og telefonnummer."
+"Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
+"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3315,7 +3373,7 @@ msgstr ""
"\n"
"Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3330,47 +3388,54 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
+"For å abonnere kan du [logge inn](%%action.login%%) eller [registrere](%%"
+"action.register%%) en ny konto. Om du allerede har en konto på et "
+"[kompatibelt mikrobloggingsnettsted](%%doc.openmublog%%), skriv inn "
+"profilnettadressen din nedenfor."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "Fjernabonner"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "Abonner på en fjernbruker"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr ""
+msgstr "Brukerens kallenavn"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Kallenavn på brukeren du vil følge"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
-msgstr ""
+msgstr "Profilnettadresse"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
msgstr ""
+"Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
msgid "Subscribe"
-msgstr ""
+msgstr "Abonner"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "Ugyldig profilnettadresse (dårlig format)"
#: actions/remotesubscribe.php:168
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
+"Ikke en gyldig profilnettadresse (inget YADIS-dokument eller ugyldig XRDS "
+"definert)."
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "Det er en lokal profil! Logg inn for å abonnere."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
@@ -3378,23 +3443,21 @@ msgstr ""
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "Bare innloggede brukere kan repetere notiser."
#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
msgid "No notice specified."
-msgstr "Nytt nick"
+msgstr "Ingen notis spesifisert."
#: actions/repeat.php:76
msgid "You can't repeat your own notice."
-msgstr ""
+msgstr "Du kan ikke gjenta din egen notis."
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "Du er allerede logget inn!"
+msgstr "Du har allerede gjentatt den notisen."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Gjentatt"
@@ -3429,11 +3492,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "Svarstrøm for %s (Atom)"
#: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
-msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
+msgstr ""
+"Dette er tidslinjen som viser svar til %1$s men %2$s har ikke mottat en "
+"notis for hans oppmerksomhet ennå."
#: actions/replies.php:204
#, php-format
@@ -3441,16 +3506,17 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Du kan engasjere andre brukere i en samtale, abonnere på flere personer "
+"eller [bli med i grupper](%%action.groups%%)."
#: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få "
-"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%"
-"s)."
+"Du kan prøve å [knuffe %1$s](../%2$s) eller [post noe for å få hans eller "
+"hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -3458,68 +3524,63 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Svar til %1$s på %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Du er allerede logget inn!"
+msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Brukeren har ingen profil."
+msgstr "Brukeren har ikke denne rollen."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "Du er allerede logget inn!"
+msgstr "Du kan ikke flytte brukere til sandkassen på dette nettstedet."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Du er allerede logget inn!"
+msgstr "Brukeren er allerede i sandkassen."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
-msgstr ""
+msgstr "Økter"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "Øktinnstillinger for dette StatusNet-nettstedet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
-msgstr ""
+msgstr "Håndter økter"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Hvorvidt økter skal håndteres av oss selv."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "Øktfeilsøking"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Slå på feilsøkingsutdata for økter."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
-#, fuzzy
msgid "Save site settings"
-msgstr "Innstillinger for IM"
+msgstr "Lagre nettstedsinnstillinger"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "Du må være innlogget for å se et program."
#: actions/showapplication.php:157
msgid "Application profile"
-msgstr ""
+msgstr "Programprofil"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -3527,7 +3588,7 @@ msgid "Icon"
msgstr "Ikon"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Navn"
@@ -3538,7 +3599,7 @@ msgid "Organization"
msgstr "Organisasjon"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Beskrivelse"
@@ -3555,23 +3616,23 @@ msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Programhandlinger"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Tilbakestill nøkkel & hemmelighet"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Programinformasjon"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Forbrukernøkkel"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Forbrukerhemmelighet"
#: actions/showapplication.php:273
msgid "Request token URL"
@@ -3590,11 +3651,13 @@ msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for "
+"klartekstsignatur."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Er du sikker på at du vil slette denne notisen?"
+msgstr ""
+"Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?"
#: actions/showfavorites.php:79
#, php-format
@@ -3625,6 +3688,8 @@ msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Du har ikke valgt en favorittnotis ennå. Klikk på favorittknappen på notiser "
+"du liker for å bokmerke dem for senere eller for å kaste et søkelys på dem."
#: actions/showfavorites.php:208
#, php-format
@@ -3632,6 +3697,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s har ikke lagt til noen notiser til sine favoritter ennå. Post noe "
+"interessant som de vil legge til sine favoritter :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3640,10 +3707,13 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s har ikke lagt noen notiser til sine favoritter ennå. Hvorfor ikke "
+"[registrere en konto](%%%%action.register%%%%) og post noe interessant som "
+"de vil legge til sine favoritter :)"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Dette er en måte å dele det du liker."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3667,7 +3737,7 @@ msgstr "Nettadresse"
#: actions/showgroup.php:283 actions/tagother.php:128
#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
-msgstr ""
+msgstr "Merk"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
@@ -3693,9 +3763,9 @@ msgid "Notice feed for %s group (Atom)"
msgstr "Notismating for %s gruppe (Atom)"
#: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s group"
-msgstr "Klarte ikke å lagre profil."
+msgstr "FOAF for gruppen %s"
#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
@@ -3754,7 +3824,7 @@ msgstr "Ingen slik melding."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Kun senderen og mottakeren kan lese denne meldingen."
#: actions/showmessage.php:108
#, php-format
@@ -3771,9 +3841,9 @@ msgid "Notice deleted."
msgstr "Notis slettet."
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Tagger"
+msgstr " merket %s"
#: actions/showstream.php:79
#, php-format
@@ -3801,30 +3871,31 @@ msgid "Notice feed for %s (Atom)"
msgstr "Notismating for %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Feed for taggen %s"
+msgstr "FOAF for %s"
#: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
+msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"Sett noe interessant nylig? Du har ikke postet noen notiser ennå, så hvorfor "
+"ikke begynne nå? :)"
#: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få "
-"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%"
-"s)."
+"Du kan prøve å knuffe %1$s eller [poste noe for å få hans eller hennes "
+"oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3858,20 +3929,19 @@ msgstr "Repetisjon av %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Du er allerede logget inn!"
+msgstr "Bruker er allerede brakt til taushet."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site"
-msgstr ""
+msgstr "Grunninnstillinger for dette StatusNet-nettstedet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Nettstedsnavnet må være minst ett tegn langt."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
@@ -3884,7 +3954,7 @@ msgstr "Ukjent språk «%s»."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "Minste tekstgrense er 0 (ubegrenset)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3900,7 +3970,7 @@ msgstr "Nettstedsnavn"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Navnet på nettstedet ditt, for eksempel «Foretaksnavn mikroblogg»"
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -3920,11 +3990,11 @@ msgstr ""
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "Kontakte-postadresse for nettstedet ditt"
#: actions/siteadminpanel.php:245
msgid "Local"
-msgstr ""
+msgstr "Lokal"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
@@ -3981,18 +4051,16 @@ msgid "Max length for the site-wide notice is 255 chars."
msgstr ""
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Slett notis"
+msgstr "Tekst for nettstedsnotis"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Innstillinger for IM"
+msgstr "Lagre nettstedsnotis"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4013,9 +4081,8 @@ msgstr "SMS er ikke tilgjengelig."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Direktemeldingsadresse"
+msgstr "SMS-adresse"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4039,7 +4106,6 @@ msgstr "Skriv inn koden du mottok på telefonen din."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Bekreft"
@@ -4056,9 +4122,8 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Innstillinger"
+msgstr "SMS-innstillinger"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4066,12 +4131,13 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"Send meg notiser via SMS; jeg forstår at dette kan føre til kostnader fra "
+"min teleoperatør."
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Innstillinger lagret."
+msgstr "SMS-innstillinger lagret."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4091,28 +4157,26 @@ msgstr "Det er allerede din ditt telefonnummer."
#. TRANS: Message given saving SMS phone number that is already set for another user.
#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Telefonnummeret tilhører allerede en annen bruker."
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
#: actions/smssettings.php:384
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
-"din for koden, og hvordan du skal bruke den."
+"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk telefonen "
+"din for koden og hvordan du skal bruke den."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Dette er feil bekreftelsesnummer."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+msgstr "SMS-bekreftelse avbrutt."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4122,9 +4186,8 @@ msgstr "Det er ikke ditt telefonnummer."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Telefonnummer for SMS"
+msgstr "Telefonnummeret for SMS ble fjernet."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4144,15 +4207,18 @@ msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
+"Mobiloperatør for din telefon. Om du kjenner til en operatør som kan motta "
+"SMS via e-post men som ikke er listet opp her, send en e-post til %s og "
+"fortell oss."
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
#: actions/smssettings.php:548
msgid "No code entered"
-msgstr ""
+msgstr "Ingen kode skrevet inn"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4223,9 +4289,8 @@ msgid "This action only accepts POST requests."
msgstr ""
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Ingen slik fil."
+msgstr "Ingen slik profil."
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -4247,12 +4312,12 @@ msgstr "Alle abonnementer"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "Dette er personene som lytter til dine notiser."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "Dette er personene som lytter til %ss notiser."
#: actions/subscribers.php:108
msgid ""
@@ -4284,12 +4349,12 @@ msgstr "Alle abonnementer"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Dette er personene hvis notiser du lytter til."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "Dette er personene hvis notiser %s lytter til."
#: actions/subscriptions.php:126
#, php-format
@@ -4322,17 +4387,17 @@ msgstr "Mikroblogg av %s"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Notismating for merkelapp %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Notismating for merkelapp %s (RSS 2.0)"
#: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed for taggen %s"
+msgstr "Notismating for merkelapp %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
@@ -4369,9 +4434,8 @@ msgid ""
msgstr ""
#: actions/tagother.php:200
-#, fuzzy
msgid "Could not save tags."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke lagre merkelapper."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -4492,7 +4556,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Lisens"
@@ -4565,9 +4629,9 @@ msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
#: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Kan ikke lese brukerbilde-URL «%s»"
+msgstr "Kan ikke lese avatar-URL ‘%s’"
#: actions/userauthorization.php:355
#, php-format
@@ -4591,9 +4655,9 @@ msgstr "Bon appétit."
#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
#: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "Alle abonnementer"
+msgstr "%1$s grupper, side %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
@@ -4614,18 +4678,18 @@ msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem.
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Oppdateringar fra %1$s på %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4634,11 +4698,11 @@ msgstr ""
"Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, "
"Inc. og andre bidragsytere."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Bidragsytere"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4646,7 +4710,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4654,39 +4718,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Programtillegg"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Versjon"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Forfatter(e)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4722,52 +4786,52 @@ msgstr ""
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Kunne ikke sette inn melding."
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Kunne ikke oppdatere melding med ny nettadresse."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problem ved lagring av notis. For lang."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problem ved lagring av notis. Ukjent bruker."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problem ved lagring av notis."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4872,205 +4936,204 @@ msgid "Untitled page"
msgstr "Side uten tittel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personlig"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Endre passordet ditt"
+msgstr "Endre e-posten, avateren, passordet og profilen din"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Koble til tjenester"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Koble til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Endre nettstedskonfigurasjon"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Inviter venner og kollegaer til å bli med deg på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg ut fra nettstedet"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Logg ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett en konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Log inn på nettstedet"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp meg."
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter personer eller tekst"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Søk"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
-msgstr ""
+msgstr "Nettstedsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
-msgstr ""
+msgstr "Lokale visninger"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
-msgstr ""
+msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Hjelp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "OSS/FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Kilde"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Programvarelisens for StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
-"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
+"**%%site.name%%** er en mikrobloggingtjeneste brakt til deg av [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5079,54 +5142,54 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Før"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5134,11 +5197,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5169,65 +5232,64 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Nettsted"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
-#, fuzzy
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
-msgstr "Personlig"
+msgstr "Utseende"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Brukerkonfigurasjon"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Bruker"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Tilgangskonfigurasjon"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Stikonfigurasjon"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Rediger nettstedsnotis"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr ""
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5316,15 +5378,13 @@ msgstr "Avbryt"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Les og skriv"
+msgstr "les og skriv"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Skrivebeskyttet"
+msgstr "skrivebeskyttet"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
@@ -5334,7 +5394,6 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Tilbakekall"
@@ -5362,25 +5421,25 @@ msgstr "Notiser hvor dette vedlegget forekommer"
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Endring av passord mislyktes"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Endring av passord er ikke tillatt"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Kommandoresultat"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Kommando fullført"
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "Kommando feilet"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
@@ -5400,13 +5459,13 @@ msgstr "Fant ingen bruker med kallenavn %s"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "Fant ingen bruker med kallenavn %s"
+msgstr "Fant ingen lokal bruker med kallenavn %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Beklager, denne kommandoen er ikke implementert ennå."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
@@ -5448,9 +5507,9 @@ msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
+msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5460,14 +5519,14 @@ msgstr "Fullt navn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Posisjon: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Hjemmeside: %s"
@@ -5488,9 +5547,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5505,11 +5564,11 @@ msgstr "Feil ved sending av direktemelding."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr "Kan ikke repetere din egen notis"
+msgstr "Kan ikke gjenta din egen notis"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr "Allerede repetert den notisen"
+msgstr "Allerede gjentatt den notisen"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
@@ -5776,7 +5835,7 @@ msgstr ""
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "GÃ¥"
#: lib/grantroleform.php:91
#, php-format
@@ -5962,8 +6021,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lytter nå til dine notiser på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5989,19 +6055,19 @@ msgstr ""
"Endre e-postadressen din eller dine varslingsvalg på %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadresse for posting til %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6023,30 +6089,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Venter på bekreftelse for dette telefonnummeret."
+msgstr "%s: bekreft telefonnummeret ditt med denne koden:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt knuffet av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6074,13 +6140,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6114,13 +6180,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s /@%s) la din notis til som en favoritt"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6158,21 +6224,24 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"Hele samtalen kan leses her:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6198,6 +6267,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) sendte deg akkurat varsel for din oppmerksomhet (et '@-svar') "
+"på %2$s.\n"
+"\n"
+"Notisen er her:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Det lyder:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sDu kan svare her:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Listen over alle @-svar til deg finner du her:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Vennlig hilsen,\n"
+"%2$s\n"
+"\n"
+"P.S. Du kan slå av disse e-postvarslene her: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6212,7 +6304,7 @@ msgstr ""
"engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
"bare du kan se."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "fra"
@@ -6366,25 +6458,25 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
#: lib/noticelist.php:447
msgid "at"
-msgstr ""
+msgstr "på"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetert av"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Notis repetert"
@@ -6457,7 +6549,7 @@ msgstr "Dine sendte meldinger"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Ukjent"
@@ -6488,13 +6580,13 @@ msgstr "Medlem siden"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Daglig gjennomsnitt"
#: lib/profileaction.php:264
msgid "All groups"
msgstr "Alle grupper"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ikke-implementert metode."
@@ -6519,7 +6611,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6540,7 +6632,7 @@ msgstr "Repeter denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6640,6 +6732,51 @@ msgstr ""
msgid "None"
msgstr "Ingen"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Systemfeil ved opplasting av fil."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Oppdatering av avatar mislyktes."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Feil ved oppdatering av fjernprofil."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6723,56 +6860,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "omtrent én time siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "omtrent én dag siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "omtrent én måned siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 41318c985..a69a7c7ea 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:31+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:39+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Toegang"
@@ -85,24 +85,24 @@ msgid "Save"
msgstr "Opslaan"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Deze pagina bestaat niet."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -115,7 +115,7 @@ msgid "No such user."
msgstr "Onbekende gebruiker."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s en vrienden, pagina %2$d"
@@ -123,33 +123,33 @@ msgstr "%1$s en vrienden, pagina %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s en vrienden"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed voor vrienden van %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed voor vrienden van %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed voor vrienden van %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -157,7 +157,7 @@ msgstr ""
"Dit is de tijdlijn voor %s en vrienden, maar niemand heeft nog mededelingen "
"geplaatst."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -167,7 +167,7 @@ msgstr ""
"groups%%) of plaats zelf berichten."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -177,7 +177,7 @@ msgstr ""
"bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,58 +187,58 @@ msgstr ""
"een bericht sturen."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "U en vrienden"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates van %1$s en vrienden op %2$s."
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "De API-functie is niet aangetroffen."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Deze methode vereist een POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -246,7 +246,7 @@ msgstr ""
"U moet een parameter met de naam \"device\" opgeven met een van de volgende "
"waardes: sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Het was niet mogelijk de gebruiker bij te werken."
@@ -266,7 +266,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -325,43 +325,43 @@ msgstr "Privéberichten aan %s"
msgid "All the direct messages sent to %s"
msgstr "Alle privéberichten aan %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Het bericht is leeg!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "De ontvanger is niet aangetroffen."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"U kunt geen privéberichten sturen aan gebruikers die niet op uw "
"vriendenlijst staan."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Er is geen status gevonden met dit ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Deze mededeling staat al in uw favorietenlijst."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Het was niet mogelijk een favoriet aan te maken."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Deze mededeling staat niet in uw favorietenlijst."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
"Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
@@ -397,122 +397,122 @@ msgstr "Het was niet mogelijk de brongebruiker te bepalen."
msgid "Could not find target user."
msgstr "Het was niet mogelijk de doelgebruiker te vinden."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
"zijn niet toegestaan."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ongeldige gebruikersnaam!"
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "De thuispagina is geen geldige URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "De volledige naam is te lang (maximaal 255 tekens)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Locatie is te lang (maximaal 255 tekens)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Te veel aliassen! Het maximale aantal is %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ongeldige alias: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "De groep is niet aangetroffen."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "U bent al lid van die groep."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "U bent geen lid van deze groep."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Groepen van %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Groepen op de site %1$s waar %2$s lid van is."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s groepen"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "groepen op %s"
@@ -527,15 +527,15 @@ msgstr "Ongeldig token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -607,12 +607,12 @@ msgstr ""
"toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -620,8 +620,8 @@ msgid "Nickname"
msgstr "Gebruikersnaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Wachtwoord"
@@ -637,11 +637,11 @@ msgstr "Toestaan"
msgid "Allow or deny access to your account information."
msgstr "Toegang tot uw gebruikersgegevens toestaan of ontzeggen."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Deze methode vereist een POST of DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "U kunt de status van een andere gebruiker niet verwijderen."
@@ -658,25 +658,25 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
msgid "Already repeated that notice."
msgstr "U hebt die mededeling al herhaald."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "De status is verwijderd."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Er is geen status gevonden met dit ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Niet aangetroffen."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -687,32 +687,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Niet-ondersteund bestandsformaat."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorieten van %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Updates over %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publieke tijdlijn"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates van iedereen"
@@ -727,12 +727,12 @@ msgstr "Herhaald naar %s"
msgid "Repeats of %s"
msgstr "Herhaald van %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Mededelingen met het label %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates met het label %1$s op %2$s!"
@@ -790,7 +790,7 @@ msgid "Preview"
msgstr "Voorvertoning"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Verwijderen"
@@ -831,11 +831,11 @@ msgstr "De avatar is verwijderd."
msgid "You already blocked that user."
msgstr "U hebt deze gebruiker reeds geblokkeerd."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Gebruiker blokkeren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -850,7 +850,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -859,7 +859,7 @@ msgstr "Nee"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Gebruiker niet blokkeren"
@@ -868,7 +868,7 @@ msgstr "Gebruiker niet blokkeren"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -876,11 +876,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
@@ -1007,7 +1007,7 @@ msgstr "U bent niet de eigenaar van deze applicatie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -1041,7 +1041,7 @@ msgstr "Deze applicatie verwijderen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Niet aangemeld."
@@ -1072,7 +1072,7 @@ msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -1113,45 +1113,53 @@ msgstr "Uiterlijk"
msgid "Design settings for this StatusNet site."
msgstr "Instellingen voor de vormgeving van deze StatusNet-website."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "De logo-URL is ongeldig."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "De vormgeving is niet beschikbaar: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Logo wijzigen"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Websitelogo"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Vormgeving wijzigen"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Vormgeving website"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Mogelijke vormgevingen voor deze website."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Aangepaste vormgeving"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Achtergrondafbeelding wijzigen"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Achtergrond"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1161,57 +1169,65 @@ msgstr ""
"bestandsgrootte is %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Uit"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Achtergrondafbeelding naast elkaar"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kleuren wijzigen"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Menubalk"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Verwijzingen"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Uitgebreid"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Aangepaste CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standaardinstellingen gebruiken"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standaardontwerp toepassen"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1221,7 +1237,7 @@ msgstr "Standaardinstellingen toepassen"
msgid "Save"
msgstr "Opslaan"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Ontwerp opslaan"
@@ -1493,7 +1509,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
@@ -1726,13 +1742,13 @@ msgstr "Deze gebruiker heeft deze rol al."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Er is geen profiel opgegeven."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Er is geen profiel met dat ID."
@@ -1875,7 +1891,7 @@ msgstr "Deze gebruiker beheerder maken"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s tijdlijn"
@@ -2306,41 +2322,41 @@ msgstr "U bent geen lid van deze groep"
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U bent al aangemeld."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Wachtwoord kwijt of vergeten?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2348,14 +2364,17 @@ msgstr ""
"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
"invoeren alvorens u uw instellingen kunt wijzigen."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen "
-"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)."
+"Hebt u nog geen gebruikersnaam? [Registreer een nieuwe gebruiker](%%action."
+"register%%)."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2562,30 +2581,30 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
"Ontwikkelaars kunnen de registratiegegevens voor hun applicaties bewerken "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Mededeling heeft geen profiel."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Inhoudstype %s wordt niet ondersteund."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -2688,7 +2707,7 @@ msgid "6 or more characters"
msgstr "Zes of meer tekens"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bevestigen"
@@ -2700,11 +2719,11 @@ msgstr "Gelijk aan het wachtwoord hierboven"
msgid "Change"
msgstr "Wijzigen"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Het wachtwoord moet zes of meer tekens bevatten."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "De wachtwoorden komen niet overeen."
@@ -2725,7 +2744,7 @@ msgid "Password saved."
msgstr "Het wachtwoord is opgeslagen."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Paden"
@@ -2931,43 +2950,43 @@ msgstr "Profielinformatie"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Thuispagina"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beschrijf uzelf en uw interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Beschrijving"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Locatie"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
@@ -3011,7 +3030,7 @@ msgstr ""
"Automatisch abonneren bij abonnement op mij (beste voor automatische "
"processen)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
@@ -3280,7 +3299,7 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
msgid "Password and confirmation do not match."
msgstr "Het wachtwoord en de bevestiging komen niet overeen."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
@@ -3288,39 +3307,39 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
msgid "New password successfully saved. You are now logged in."
msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Sorry. De uitnodigingscode is ongeldig."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registratie is niet toegestaan."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Het e-mailadres bestaat al."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3328,33 +3347,56 @@ msgstr ""
"Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
"mededelingen uitsturen en contact maken met vrienden en collega's. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Zes of meer tekens. Verplicht"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Een langere naam, mogelijk uw echte naam"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Alle rechten voorbehouden."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3364,7 +3406,7 @@ msgstr ""
"behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
"telefoonnummer."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3398,7 +3440,7 @@ msgstr ""
"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
"ervan verwacht."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3481,7 +3523,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
msgid "You already repeated that notice."
msgstr "U hent die mededeling al herhaald."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Herhaald"
@@ -3555,7 +3597,7 @@ msgstr "U kunt geen gebruikersrollen intrekken op deze website."
msgid "User doesn't have this role."
msgstr "Deze gebruiker heeft deze rol niet."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3569,7 +3611,7 @@ msgstr "Deze gebruiker is al in de zandbak geplaatst."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessies"
@@ -3612,7 +3654,7 @@ msgid "Icon"
msgstr "Icoon"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Naam"
@@ -3623,7 +3665,7 @@ msgid "Organization"
msgstr "Organisatie"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Beschrijving"
@@ -4254,7 +4296,7 @@ msgstr "Er is geen code ingevoerd"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Snapshots"
@@ -4613,7 +4655,7 @@ msgstr ""
"aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
"klik dan op \"Afwijzen\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licentie"
@@ -4743,18 +4785,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Updates van %1$s op %2$s."
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4763,11 +4805,11 @@ msgstr ""
"Deze website wordt aangedreven door %1$2 versie %2$s. Auteursrechten "
"voorbehouden 2008-2010 Statusnet, Inc. en medewerkers."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Medewerkers"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4779,7 +4821,7 @@ msgstr ""
"zoals gepubliceerd door de Free Software Foundation, versie 3 van de "
"Licentie, of (naar uw keuze) elke latere versie. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4791,7 +4833,7 @@ msgstr ""
"GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Affero General Public License "
"voor meer details. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4800,20 +4842,20 @@ msgstr ""
"Samen met dit programma hoort u een kopie van de GNU Affero General Public "
"License te hebben ontvangen. Zo niet, zie dan %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Plug-ins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Versie"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Auteur(s)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4822,13 +4864,13 @@ msgstr ""
"Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. "
"Probeer een kleinere versie te uploaden."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Een bestand van deze grootte overschijdt uw gebruikersquota van %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4868,31 +4910,31 @@ msgid "Could not update message with new URI."
msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
"lang."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr ""
"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
"onbekend."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer "
"het over enige tijd weer."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4900,16 +4942,16 @@ msgstr ""
"Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
"plaats over een aantal minuten pas weer een bericht."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -4917,7 +4959,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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5019,188 +5061,188 @@ msgid "Untitled page"
msgstr "Naamloze pagina"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlijk"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Met andere diensten koppelen"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Koppelen"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodigingen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Gebruiker afmelden"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Afmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Gebruiker aanmaken"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registreren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Gebruiker aanmelden"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Aanmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Zoeken"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Mededeling van de website"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Lokale weergaven"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Mededeling van de pagina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Over"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Veel gestelde vragen"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Broncode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Widget"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5210,13 +5252,13 @@ msgstr ""
"broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** is een microblogdienst."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5228,20 +5270,20 @@ msgstr ""
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5249,38 +5291,38 @@ msgstr ""
"voorbehouden."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
"gebruikers. Alle rechten voorbehouden."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Eerder"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
@@ -5288,11 +5330,11 @@ msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
msgid "Can't handle remote content yet."
msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken"
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken"
@@ -5323,64 +5365,64 @@ msgid "Unable to delete design setting."
msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Basisinstellingen voor de website"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Website"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Instellingen vormgeving"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Uiterlijk"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Gebruikersinstellingen"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Gebruiker"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Toegangsinstellingen"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Padinstellingen"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Sessieinstellingen"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Websitebrede mededeling opslaan"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Snapshotinstellingen"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen "
@@ -5513,11 +5555,11 @@ msgstr "Mededelingen die deze bijlage bevatten"
msgid "Tags for this attachment"
msgstr "Labels voor deze bijlage"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Wachtwoord wijzigen is mislukt"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Wachtwoord wijzigen is niet toegestaan"
@@ -5600,7 +5642,7 @@ msgstr ""
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen."
@@ -5612,14 +5654,14 @@ msgstr "Volledige naam: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Locatie: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Thuispagina: %s"
@@ -6162,8 +6204,17 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s volgt nu uw berichten %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Als u denkt dat deze gebruiker wordt misbruikt, dan kunt u deze voor uw "
+"abonnees blokkeren en als spam rapporteren naar de websitebeheerders op %s."
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6189,19 +6240,19 @@ msgstr ""
"Wijzig uw e-mailadres of instellingen op %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Beschrijving: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6223,30 +6274,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bevestig dat u deze telefoon bezit met deze code:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s heeft u gepord"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6275,13 +6326,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "U hebt een nieuw privébericht van %s."
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6316,13 +6367,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6361,7 +6412,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6372,13 +6423,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) heeft u een mededeling gestuurd"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6440,7 +6491,7 @@ msgstr ""
"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "van"
@@ -6602,23 +6653,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "op"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Herhaald door"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Op deze mededeling antwoorden"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Antwoorden"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Mededeling herhaald"
@@ -6693,7 +6744,7 @@ msgstr "Uw verzonden berichten"
msgid "Tags in %s's notices"
msgstr "Labels in de mededelingen van %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Onbekend"
@@ -6730,7 +6781,7 @@ msgstr "Dagelijks gemiddelde"
msgid "All groups"
msgstr "Alle groepen"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Methode niet geïmplementeerd."
@@ -6754,7 +6805,7 @@ msgstr "Uitgelicht"
msgid "Popular"
msgstr "Populair"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Er zijn geen \"terug naar\"-parameters opgegeven."
@@ -6775,7 +6826,7 @@ msgstr "Deze mededeling herhalen"
msgid "Revoke the \"%s\" role from this user"
msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
@@ -6873,6 +6924,58 @@ msgstr "Gebruikerslabelwolk"
msgid "None"
msgstr "Geen"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"Deze server kan niet overweg met uploads van vormgevingsbestanden zonder ZIP-"
+"ondersteuning."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Het uploaden van het bestand met de vormgeving is mislukt."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Het opslaan van de vormgeving is mislukt."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Ongeldige vormgeving: de mappenstructuur is onjuist."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"De toegevoegde vormgeving is te groot. Deze moet uitgepakt kleiner zijn dan %"
+"d bytes."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+"Ongeldig bestand met vormgeving: het bestand display.css is niet aanwezig"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"De vormgeving bevat een ongeldige bestandsnaam of mapnaam. Gebruik alleen "
+"maar ASCII-letters, getallen, liggende streepjes en het minteken."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+"De vormgeving bevat een bestand van het type \".%s\". Dit is niet toegestaan."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr ""
+"Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
+"vormgeving."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Meest actieve gebruikers"
@@ -6953,56 +7056,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 2df7238a6..dc166d820 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:27+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:35+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -21,7 +21,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Godta"
@@ -91,25 +91,25 @@ msgid "Save"
msgstr "Lagra"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Dette emneord finst ikkje."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -122,7 +122,7 @@ msgid "No such user."
msgstr "Brukaren finst ikkje."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s med vener, side %d"
@@ -130,39 +130,39 @@ msgstr "%s med vener, side %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s med vener"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Straum for vener av %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Straum for vener av %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Straum for vener av %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -170,14 +170,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,66 +185,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s med vener"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringar frå %1$s og vener på %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Fann ikkje API-metode."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Dette krev ein POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Kan ikkje oppdatera brukar."
@@ -266,7 +266,7 @@ msgstr "Kan ikkje lagra profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -326,43 +326,43 @@ msgstr "Direkte meldingar til %s"
msgid "All the direct messages sent to %s"
msgstr "Alle direkte meldingar sendt til %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Inga meldingstekst!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Kunne ikkje finne mottakar."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Fann ingen status med den ID-en."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Denne notisen er alt ein favoritt!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Kunne ikkje lagre favoritt."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
#, fuzzy
msgid "That status is not a favorite."
msgstr "Denne notisen er ikkje ein favoritt!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Kunne ikkje slette favoritt."
@@ -399,122 +399,122 @@ msgstr "Kan ikkje hente offentleg straum."
msgid "Could not find target user."
msgstr "Kan ikkje finna einkvan status."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ikkje eit gyldig brukarnamn."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Heimesida er ikkje ei gyldig internettadresse."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "skildringa er for lang (maks 140 teikn)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Plassering er for lang (maksimalt 255 teikn)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ugyldig merkelapp: %s"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Fann ikkje API-metode."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "Du er allereie medlem av den gruppa"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "Du er ikkje medlem av den gruppa."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Kunne ikkje fjerne %s fra %s gruppa "
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "%s grupper"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Grupper %s er medlem av"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s grupper"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, fuzzy, php-format
msgid "groups on %s"
msgstr "Gruppe handlingar"
@@ -530,15 +530,15 @@ msgstr "Ugyldig storleik."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -602,12 +602,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -615,8 +615,8 @@ msgid "Nickname"
msgstr "Kallenamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passord"
@@ -633,11 +633,11 @@ msgstr "Alle"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Dette krev anten ein POST eller DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Du kan ikkje sletta statusen til ein annan brukar."
@@ -656,26 +656,26 @@ msgstr "Kan ikkje slå på notifikasjon."
msgid "Already repeated that notice."
msgstr "Slett denne notisen"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "Lasta opp brukarbilete."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Fann ingen status med den ID-en."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Finst ikkje."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -685,32 +685,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Støttar ikkje bileteformatet."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favorittar frå %s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s oppdateringar favorisert av %s / %s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Oppdateringar som svarar til %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentleg tidsline"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringar frå alle saman!"
@@ -725,12 +725,12 @@ msgstr "Svar til %s"
msgid "Repeats of %s"
msgstr "Svar til %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notisar merka med %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
@@ -789,7 +789,7 @@ msgid "Preview"
msgstr "Forhandsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Slett"
@@ -832,11 +832,11 @@ msgstr "Lasta opp brukarbilete."
msgid "You already blocked that user."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukaren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -848,7 +848,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -858,7 +858,7 @@ msgstr "Nei"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "LÃ¥s opp brukaren"
@@ -868,7 +868,7 @@ msgstr "LÃ¥s opp brukaren"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -877,11 +877,11 @@ msgid "Yes"
msgstr "Jau"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkér denne brukaren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
@@ -1015,7 +1015,7 @@ msgstr "Du er ikkje medlem av den gruppa."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -1049,7 +1049,7 @@ msgstr "Slett denne notisen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ikkje logga inn"
@@ -1082,7 +1082,7 @@ msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1124,51 +1124,60 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ugyldig storleik."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Endra passordet ditt"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "Invitér"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Endra"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
#, fuzzy
msgid "Theme for the site."
msgstr "Logg ut or sida"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Statusmelding"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1176,61 +1185,68 @@ msgid ""
msgstr "Du kan lasta opp ein logo for gruppa."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Endra passordet ditt"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
-msgstr "Kopla til"
+msgstr "Innhald"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1240,7 +1256,7 @@ msgstr ""
msgid "Save"
msgstr "Lagra"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1533,7 +1549,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
@@ -1771,13 +1787,13 @@ msgstr "Brukar har blokkert deg."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen vald profil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Fann ingen profil med den IDen."
@@ -1925,7 +1941,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s tidsline"
@@ -2344,40 +2360,40 @@ msgstr "Du er ikkje medlem av den gruppa."
msgid "%1$s left group %2$s"
msgstr "%s forlot %s gruppa"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allereie logga inn."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Feil brukarnamn eller passord"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mista eller gløymd passord?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2385,11 +2401,15 @@ msgstr ""
"Skriv inn brukarnam og passord før du endrar innstillingar (av "
"tryggleiksomsyn)."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Log inn med brukarnamn og passord."
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%"
"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
@@ -2599,31 +2619,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Notisen har ingen profil"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "Kopla til"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -2733,7 +2753,7 @@ msgid "6 or more characters"
msgstr "6 eller fleire teikn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Godta"
@@ -2745,11 +2765,11 @@ msgstr "Samme passord som over"
msgid "Change"
msgstr "Endra"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 teikn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passorda var ikkje like."
@@ -2770,7 +2790,7 @@ msgid "Password saved."
msgstr "Lagra passord."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2986,44 +3006,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt namn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimeside"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Skriv om deg og interessene dine med 140 teikn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Skildra deg sjølv og din"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Om meg"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plassering"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
@@ -3066,7 +3086,7 @@ msgid ""
msgstr ""
"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
@@ -3318,7 +3338,7 @@ msgstr "Passord må vera 6 tekn eller meir."
msgid "Password and confirmation do not match."
msgstr "Passord og stadfesting stemmer ikkje."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
@@ -3326,75 +3346,97 @@ msgstr "Feil ved å setja brukar."
msgid "New password successfully saved. You are now logged in."
msgstr "Lagra det nye passordet. Du er logga inn."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Beklage, men kun inviterte kan registrere seg."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Feil med stadfestingskode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrering ikkje tillatt."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Epostadressa finst allereie."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ugyldig brukarnamn eller passord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
"Kravd."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eller fleire teikn. Kravd."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samme som passord over. PÃ¥krevd."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Epost"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3403,7 +3445,7 @@ msgstr ""
" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
"telefonnummer."
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3435,7 +3477,7 @@ msgstr ""
"\n"
"Takk for at du blei med, og vi håpar du vil lika tenesta!"
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3524,7 +3566,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
msgid "You already repeated that notice."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Lag"
@@ -3596,7 +3638,7 @@ msgstr "Du kan ikkje sende melding til denne brukaren."
msgid "User doesn't have this role."
msgstr "Kan ikkje finne brukar"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Lasta opp brukarbilete."
@@ -3613,7 +3655,7 @@ msgstr "Brukar har blokkert deg."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3659,7 +3701,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3672,7 +3714,7 @@ msgid "Organization"
msgstr "Paginering"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Beskriving"
@@ -4286,7 +4328,7 @@ msgstr "Ingen innskriven kode"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4645,7 +4687,7 @@ msgstr ""
"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
#, fuzzy
msgid "License"
msgstr "lisens."
@@ -4777,29 +4819,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Statistikk"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4807,7 +4849,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4815,40 +4857,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "Personleg"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4892,27 +4934,27 @@ msgid "Could not update message with new URI."
msgstr "Kunne ikkje oppdatere melding med ny URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Feil ved lagring av notis. Ukjend brukar."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4920,22 +4962,22 @@ msgid ""
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
#. 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:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5043,133 +5085,133 @@ msgid "Untitled page"
msgstr "Ingen tittel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personleg"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endra e-posten, avataren, passordet eller profilen"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Kopla til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Navigasjon for hovudsida"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invitér"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg ut or sida"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Logg ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett ny konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registrér"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5177,72 +5219,72 @@ msgstr "Søk"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Statusmelding"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Lokale syningar"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Hjelp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "OSS"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Personvern"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Kjeldekode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
#, fuzzy
msgid "Badge"
msgstr "Dult"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5252,13 +5294,13 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er ei mikrobloggingteneste."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5270,55 +5312,55 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Før »"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5326,11 +5368,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5366,74 +5408,74 @@ msgid "Unable to delete design setting."
msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Stadfesting av epostadresse"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Invitér"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "SMS bekreftelse"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Personleg"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "SMS bekreftelse"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Brukar"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "SMS bekreftelse"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "SMS bekreftelse"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "SMS bekreftelse"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Statusmelding"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS bekreftelse"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5569,12 +5611,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Endra passord"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Endra passord"
@@ -5667,14 +5709,14 @@ msgstr "Fullt namn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Stad: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Heimeside: %s"
@@ -5923,9 +5965,8 @@ msgid "Database error"
msgstr ""
#: lib/designsettings.php:105
-#, fuzzy
msgid "Upload file"
-msgstr "Last opp"
+msgstr "Last opp fil"
#: lib/designsettings.php:109
#, fuzzy
@@ -6166,8 +6207,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s høyrer no på notisane dine på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6189,7 +6237,7 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6197,13 +6245,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny epostadresse for å oppdatera %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6224,30 +6272,30 @@ msgstr ""
"Helsing frå %4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Ventar på godkjenning for dette telefonnummeret."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt dulta av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6264,13 +6312,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6290,13 +6338,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s la til di melding som ein favoritt"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6318,7 +6366,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6326,13 +6374,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6369,7 +6417,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr " frå "
@@ -6529,25 +6577,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Ingen innhald."
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Lag"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Melding lagra"
@@ -6622,7 +6670,7 @@ msgstr "Dine sende meldingar"
msgid "Tags in %s's notices"
msgstr "Merkelappar i %s sine notisar"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "Uventa handling."
@@ -6661,7 +6709,7 @@ msgstr ""
msgid "All groups"
msgstr "Alle gruppar"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6685,7 +6733,7 @@ msgstr "Framheva"
msgid "Popular"
msgstr "Populære"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Manglar argumentet ID."
@@ -6709,7 +6757,7 @@ msgstr "Svar på denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ei liste over brukarane i denne gruppa."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6813,6 +6861,51 @@ msgstr ""
msgid "None"
msgstr "Ingen"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Systemfeil ved opplasting av fil."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Feil ved oppdatering av brukarbilete."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Feil ved oppdatering av ekstern profil"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Med flest meldingar"
@@ -6899,56 +6992,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 4aeae1113..95146156b 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:35+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:44+0000\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,14 +20,14 @@ 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 (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Dostęp"
@@ -89,24 +89,24 @@ msgid "Save"
msgstr "Zapisz"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Nie ma takiej strony."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -119,7 +119,7 @@ msgid "No such user."
msgstr "Brak takiego użytkownika."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s i przyjaciele, strona %2$d"
@@ -127,33 +127,33 @@ msgstr "%1$s i przyjaciele, strona %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "Użytkownik %s i przyjaciele"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Kanał dla znajomych użytkownika %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -161,7 +161,7 @@ msgstr ""
"To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie "
"wysłał."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -171,7 +171,7 @@ msgstr ""
"wysłać coś samemu."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -181,7 +181,7 @@ msgstr ""
"[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -191,65 +191,65 @@ msgstr ""
"szturchniesz użytkownika %s lub wyślesz wpis wymagającego jego uwagi."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Ty i przyjaciele"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Nie odnaleziono metody API."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Ta metoda wymaga POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"Należy podać parametr o nazwie \"device\" z jedną z wartości: sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Nie można zaktualizować użytkownika."
@@ -269,7 +269,7 @@ msgstr "Nie można zapisać profilu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -328,43 +328,43 @@ msgstr "Bezpośrednia wiadomość do użytkownika %s"
msgid "All the direct messages sent to %s"
msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Brak tekstu wiadomości."
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Nie odnaleziono odbiorcy."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
"twoimi przyjaciółmi."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Nie odnaleziono stanów z tym identyfikatorem."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Ten stan jest już ulubiony."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Nie można utworzyć ulubionego wpisu."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Ten stan nie jest ulubiony."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Nie można usunąć ulubionego wpisu."
@@ -398,119 +398,119 @@ msgstr "Nie można określić użytkownika źródłowego."
msgid "Could not find target user."
msgstr "Nie można odnaleźć użytkownika docelowego."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Pseudonim jest już używany. Spróbuj innego."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "To nie jest prawidłowy pseudonim."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Strona domowa nie jest prawidłowym adresem URL."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Opis jest za długi (maksymalnie %d znaków)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Za dużo aliasów. Maksymalnie %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Nieprawidłowy alias: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias nie może być taki sam jak pseudonim."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Nie odnaleziono grupy."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Jesteś już członkiem tej grupy."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Zostałeś zablokowany w tej grupie przez administratora."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Nie jesteś członkiem tej grupy."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Grupy użytkownika %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%2$s jest członkiem grup %1$s."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Grupy %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "grupy na %s"
@@ -525,15 +525,15 @@ msgstr "Nieprawidłowy token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -598,12 +598,12 @@ msgstr ""
"$s powinien być udostępniany tylko zaufanym osobom trzecim."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +611,8 @@ msgid "Nickname"
msgstr "Pseudonim"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Hasło"
@@ -628,11 +628,11 @@ msgstr "Zezwól"
msgid "Allow or deny access to your account information."
msgstr "Zezwól lub odmów dostęp do informacji konta."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ta metoda wymaga POST lub DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Nie można usuwać stanów innych użytkowników."
@@ -649,25 +649,25 @@ msgstr "Nie można powtórzyć własnego wpisu."
msgid "Already repeated that notice."
msgstr "Już powtórzono ten wpis."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Usunięto stan."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Nie odnaleziono stanów z tym identyfikatorem."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nie odnaleziono."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
@@ -676,32 +676,32 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika
msgid "Unsupported format."
msgstr "Nieobsługiwany format."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s/ulubione wpisy od %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s/aktualizacje wspominajÄ…ce %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Publiczna oś czasu użytkownika %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Użytkownik %s aktualizuje od każdego."
@@ -716,12 +716,12 @@ msgstr "Powtórzone dla %s"
msgid "Repeats of %s"
msgstr "Powtórzenia %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Wpisy ze znacznikiem %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
@@ -778,7 +778,7 @@ msgid "Preview"
msgstr "PodglÄ…d"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Usuń"
@@ -818,11 +818,11 @@ msgstr "Usunięto awatar."
msgid "You already blocked that user."
msgstr "Użytkownik jest już zablokowany."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Zablokuj użytkownika"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -837,7 +837,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -846,7 +846,7 @@ msgstr "Nie"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Nie blokuj tego użytkownika"
@@ -855,7 +855,7 @@ msgstr "Nie blokuj tego użytkownika"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -863,11 +863,11 @@ msgid "Yes"
msgstr "Tak"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
@@ -994,7 +994,7 @@ msgstr "Nie jesteś właścicielem tej aplikacji."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -1027,7 +1027,7 @@ msgstr "Usuń tę aplikację"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Niezalogowany."
@@ -1058,7 +1058,7 @@ msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Usuń ten wpis"
@@ -1098,45 +1098,53 @@ msgstr "WyglÄ…d"
msgid "Design settings for this StatusNet site."
msgstr "Ustawienia wyglÄ…du tej witryny StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Nieprawidłowy adres URL logo."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Motyw nie jest dostępny: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Zmień logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo witryny"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Zmień motyw"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Motyw witryny"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Motyw witryny."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "WÅ‚asny motyw"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Zmień obraz tła"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "TÅ‚o"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1144,57 +1152,65 @@ 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:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "WÅ‚Ä…czone"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Wyłączone"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Włącz lub wyłącz obraz tła."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Kafelkowy obraz tła"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Zmień kolory"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Treść"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Panel boczny"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Odnośniki"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "WÅ‚asny plik CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Użycie domyślnych"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Przywróć domyślny wygląd"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1204,7 +1220,7 @@ msgstr "Przywróć domyślne ustawienia"
msgid "Save"
msgstr "Zapisz"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Zapisz wyglÄ…d"
@@ -1475,7 +1491,7 @@ msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
@@ -1703,13 +1719,13 @@ msgstr "Użytkownik ma już tę rolę."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nie podano profilu."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Brak profilu o tym identyfikatorze."
@@ -1846,7 +1862,7 @@ msgstr "Uczyń tego użytkownika administratorem"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Oś czasu użytkownika %s"
@@ -2272,41 +2288,41 @@ msgstr "Nie jesteś członkiem tej grupy."
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj siÄ™"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Zaloguj siÄ™ na witrynie"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
"wiele osób."
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Zgubione lub zapomniane hasło?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2314,14 +2330,17 @@ msgstr ""
"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
"zmienianiem ustawień."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
-"[Zarejestruj](%%action.register%%) nowe konto."
+"Nie masz jeszcze nazwy użytkownika? [Zarejestruj](%%action.register%%) nowe "
+"konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2521,30 +2540,30 @@ msgstr "Nie upoważniono żadnych aplikacji do używania konta."
msgid "Developers can edit the registration settings for their applications "
msgstr "Programiści mogą zmodyfikować ustawienia rejestracji swoich aplikacji "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Wpis nie posiada profilu."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stan użytkownika %1$s na %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Typ zawartości %s jest nieobsługiwany."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -2647,7 +2666,7 @@ msgid "6 or more characters"
msgstr "6 lub więcej znaków"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Potwierdź"
@@ -2659,11 +2678,11 @@ msgstr "Takie samo jak powyższe hasło"
msgid "Change"
msgstr "Zmień"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Hasło musi mieć sześć lub więcej znaków."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hasła nie pasują do siebie."
@@ -2684,7 +2703,7 @@ msgid "Password saved."
msgstr "Zapisano hasło."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Ścieżki"
@@ -2890,43 +2909,43 @@ msgstr "Informacje o profilu"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "ImiÄ™ i nazwisko"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Opisz siÄ™ i swoje zainteresowania w %d znakach"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Opisz siÄ™ i swoje zainteresowania"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "O mnie"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Położenie"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
@@ -2969,7 +2988,7 @@ msgid ""
msgstr ""
"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
@@ -3230,7 +3249,7 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
msgid "Password and confirmation do not match."
msgstr "Hasło i potwierdzenie nie pasują do siebie."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
@@ -3238,40 +3257,40 @@ msgstr "Błąd podczas ustawiania użytkownika."
msgid "New password successfully saved. You are now logged in."
msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Tylko zaproszone osoby mogą się rejestrować."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Nieprawidłowy kod zaproszenia."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj siÄ™"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Rejestracja nie jest dozwolona."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Adres e-mail już istnieje."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3279,34 +3298,56 @@ msgstr ""
"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
"wpisy i połączyć się z przyjaciółmi i kolegami. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 lub więcej znaków. Wymagane."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Moje teksty i pliki pozostajÄ… pod moimi prawami autorskimi."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Wszystkie prawa zastrzeżone."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3315,7 +3356,7 @@ msgstr ""
"Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
"danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3348,7 +3389,7 @@ msgstr ""
"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
"sprawi ci przyjemność."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3431,7 +3472,7 @@ msgstr "Nie można powtórzyć własnego wpisu."
msgid "You already repeated that notice."
msgstr "Już powtórzono ten wpis."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Powtórzono"
@@ -3505,7 +3546,7 @@ msgstr "Nie można unieważnić rol użytkowników na tej witrynie."
msgid "User doesn't have this role."
msgstr "Użytkownik nie ma tej roli."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3519,7 +3560,7 @@ msgstr "Użytkownik jest już ograniczony."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sesje"
@@ -3562,7 +3603,7 @@ msgid "Icon"
msgstr "Ikona"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nazwa"
@@ -3573,7 +3614,7 @@ msgid "Organization"
msgstr "Organizacja"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Opis"
@@ -4196,7 +4237,7 @@ msgstr "Nie podano kodu"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Migawki"
@@ -4552,7 +4593,7 @@ msgstr ""
"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
"naciśnij \"Odrzuć\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licencja"
@@ -4678,18 +4719,18 @@ msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Aktualizacje z %1$s na %2$s."
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4698,11 +4739,11 @@ msgstr ""
"Ta witryna korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 "
"StatusNet, Inc. i współtwórcy."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Współtwórcy"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4714,7 +4755,7 @@ msgstr ""
"wydanej przez FundacjÄ™ Wolnego Oprogramowania (Free Software Foundation) - "
"według wersji trzeciej tej Licencji lub którejś z późniejszych wersji. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4727,7 +4768,7 @@ msgstr ""
"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną "
"Affero GNU. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4737,20 +4778,20 @@ msgstr ""
"Powszechnej Licencji Publicznej Affero GNU (GNU Affero General Public "
"License); jeśli nie - proszę odwiedzić stronę internetową %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Wtyczki"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Wersja"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autorzy"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4759,13 +4800,13 @@ msgstr ""
"Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. "
"Spróbuj wysłać mniejszą wersję."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4806,27 +4847,27 @@ msgid "Could not update message with new URI."
msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika mieszania: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problem podczas zapisywania wpisu. Za długi."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
"kilka minut."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4834,21 +4875,21 @@ msgstr ""
"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
"wyślij ponownie za kilka minut."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4949,188 +4990,188 @@ msgid "Untitled page"
msgstr "Strona bez nazwy"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Główna nawigacja witryny"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Osobiste"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Połącz z serwisami"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Połącz"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Zmień konfigurację witryny"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "ZaproÅ›"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Wyloguj siÄ™ z witryny"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Wyloguj siÄ™"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Utwórz konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Zarejestruj siÄ™"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Zaloguj siÄ™ na witrynie"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Zaloguj siÄ™"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Wyszukaj"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Wpis witryny"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Lokalne widoki"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Wpis strony"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Druga nawigacja witryny"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Pomoc"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "O usłudze"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Prywatność"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Kod źródłowy"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Odznaka"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5140,13 +5181,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** jest usługą mikroblogowania."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5158,20 +5199,20 @@ msgstr ""
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licencja zawartości witryny"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Treść i dane %1$s są prywatne i poufne."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5179,14 +5220,14 @@ msgstr ""
"zastrzeżone."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
"prawa zastrzeżone."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5194,24 +5235,24 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Wcześniej"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
@@ -5219,11 +5260,11 @@ msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
msgid "Can't handle remote content yet."
msgstr "Nie można jeszcze obsługiwać zdalnej treści."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64."
@@ -5254,64 +5295,64 @@ msgid "Unable to delete design setting."
msgstr "Nie można usunąć ustawienia wyglądu."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Podstawowa konfiguracja witryny"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Witryna"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Konfiguracja wyglÄ…du"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "WyglÄ…d"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Konfiguracja użytkownika"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Użytkownik"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Konfiguracja dostępu"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Konfiguracja ścieżek"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Konfiguracja sesji"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Zmodyfikuj wpis witryny"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Konfiguracja migawek"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko "
@@ -5444,11 +5485,11 @@ msgstr "Powiadamia, kiedy pojawia się ten załącznik"
msgid "Tags for this attachment"
msgstr "Znaczniki dla tego załącznika"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Zmiana hasła nie powiodła się"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Zmiana hasła nie jest dozwolona"
@@ -5530,9 +5571,9 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
+msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5542,14 +5583,14 @@ msgstr "ImiÄ™ i nazwisko: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Położenie: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Strona domowa: %s"
@@ -6089,8 +6130,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Jeśli użytkownik uważa, że to konto jest używane w złośliwych celach, może "
+"zablokować je z listy subskrybentów i zgłosić je jako spam do "
+"administratorów witryny na %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6116,19 +6167,19 @@ msgstr ""
"Zmień adres e-mail lub opcje powiadamiania na %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "O mnie: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nowy adres e-mail do wysyłania do %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6150,30 +6201,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Stan użytkownika %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Potwierdzenie SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: proszę potwierdzić własny numer telefonu za pomocą tego kodu:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Zostałeś szturchnięty przez %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6201,13 +6252,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nowa prywatna wiadomość od użytkownika %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6241,13 +6292,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "Użytkownik %s (@%s) dodał twój wpis jako ulubiony"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6286,7 +6337,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6297,13 +6348,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "Użytkownik %s (@%s) wysłał wpis wymagający twojej uwagi"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6366,7 +6417,7 @@ msgstr ""
"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
"twoich oczu."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "z"
@@ -6523,23 +6574,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "w"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "w rozmowie"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Powtórzone przez"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Odpowiedz"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Powtórzono wpis"
@@ -6612,7 +6663,7 @@ msgstr "Wysłane wiadomości"
msgid "Tags in %s's notices"
msgstr "Znaczniki we wpisach użytkownika %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Nieznane"
@@ -6649,7 +6700,7 @@ msgstr "Dziennie średnio"
msgid "All groups"
msgstr "Wszystkie grupy"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Niezaimplementowana metoda."
@@ -6673,7 +6724,7 @@ msgstr "Znane"
msgid "Popular"
msgstr "Popularne"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Brak parametrów powrotu."
@@ -6694,7 +6745,7 @@ msgstr "Powtórz ten wpis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Unieważnij rolę \"%s\" tego użytkownika"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
"Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
@@ -6793,6 +6844,53 @@ msgstr "Chmura znaczników osób ze znacznikami"
msgid "None"
msgstr "Brak"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+"Ten serwer nie może obsługiwać wysyłania motywu bez obsługi archiwów zip."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Brak wysłania motywu lub nie powiodło się."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Zapisanie motywu nie powiodło się."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Nieprawidłowy motyw: błędna struktura katalogów."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Wysłany motyw jest za duży, musi być mniejszy niż %d bajtów po "
+"zdekompresowaniu."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Nieprawidłowe archiwum motywu: brak pliku css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Motyw zawiera nieprawidłowy plik lub nazwę katalogu. Należy używać tylko "
+"liter, cyfr, podkreślników i znaku minus z zestawu ASCII."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "Motyw zawiera plik typu \\\".%s\\\", który nie jest dozwolony."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "BÅ‚Ä…d podczas otwierania archiwum motywu."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Najczęściej wysyłający wpisy"
@@ -6873,56 +6971,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "kilka sekund temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "około minutę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "około godzinę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "blisko dzień temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "około miesiąc temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 8318da1ba..d2b2720bb 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,5 +1,7 @@
# Translation of StatusNet to Portuguese
#
+# Author@translatewiki.net: Gallaecio
+# Author@translatewiki.net: Giro720
# Author@translatewiki.net: Hamilton Abreu
# Author@translatewiki.net: Ipublicis
# --
@@ -9,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:38+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:48+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -22,21 +24,19 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Acesso"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "Gravar configurações do site"
+msgstr "Configurações de acesso ao site"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Registration"
-msgstr "Registar"
+msgstr "Registo"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -45,7 +45,6 @@ msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Privado"
@@ -72,9 +71,8 @@ msgstr "Fechado"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "Gravar configurações do site"
+msgstr "Gravar configurações de acesso"
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
@@ -83,31 +81,29 @@ msgstr "Gravar configurações do site"
#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
#: actions/imsettings.php:184 actions/smssettings.php:209
#: lib/applicationeditform.php:361
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Gravar"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Página não encontrada."
+msgstr "Página não foi encontrada."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -117,51 +113,51 @@ msgstr "Página não encontrada."
#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
-msgstr "Utilizador não encontrado."
+msgstr "Utilizador não foi encontrado."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
-#, fuzzy, php-format
+#: actions/all.php:90
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "Perfis bloqueados de %1$s, página %2$d"
+msgstr "%1$s e amigos, página %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s e amigos"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Fonte para os amigos de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Fonte para os amigos de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Fonte para os amigos de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
"Estas são as notas de %s e dos amigos, mas ainda não publicaram nenhuma."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -171,7 +167,7 @@ msgstr ""
"publicar qualquer coisa."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -180,7 +176,7 @@ msgstr ""
"Pode tentar [dar um toque em %1$s](../%2$s) a partir do perfil ou [publicar "
"qualquer coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -190,66 +186,65 @@ msgstr ""
"publicar uma nota à sua atenção."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Você e seus amigos"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizações de %1$s e amigos no %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método da API não encontrado."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Este método requer um POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none"
+"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Não foi possível actualizar o utilizador."
@@ -269,7 +264,7 @@ msgstr "Não foi possível gravar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -328,42 +323,42 @@ msgstr "Mensagens directas para %s"
msgid "All the direct messages sent to %s"
msgstr "Todas as mensagens directas enviadas para %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Mensagem não tem texto!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Destinatário não encontrado."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Não pode enviar mensagens directas a utilizadores que não sejam amigos."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Nenhum estado encontrado com esse ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Este estado já é um favorito."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Não foi possível criar o favorito."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Esse estado não é um favorito."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Não foi possível eliminar o favorito."
@@ -397,144 +392,142 @@ msgstr "Não foi possível determinar o utilizador de origem."
msgid "Could not find target user."
msgstr "Não foi possível encontrar o utilizador de destino."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Utilizador já é usado. Tente outro."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Utilizador não é válido."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Página de ínicio não é uma URL válida."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Descrição demasiado longa (máx. 140 caracteres)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Localidade demasiado longa (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr "Demasiados sinónimos (máx. %d)."
+msgstr "Demasiados nomes alternativos! Máx. %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Sinónimo inválido: \"%s\""
+msgstr "Nome alternativo inválido: \"%s\""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Sinónimo \"%s\" já em uso. Tente outro."
+msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr "Os sinónimos não podem ser iguais ao nome do utilizador."
+msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "Grupo não foi encontrado!"
+msgstr "Grupo não foi encontrado."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Já é membro desse grupo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Foi bloqueado desse grupo pelo gestor."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Não é membro deste grupo."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Não foi possível remover %1$s do grupo %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Grupos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#: actions/apigrouplist.php:108
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Grupos de que %s é membro"
+msgstr "Grupos de %1$s de que %2$s é membro."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Grupos de %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "Grupos em %s"
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "Não foi fornecido o parâmetro oauth_token."
#: actions/apioauthauthorize.php:106
-#, fuzzy
msgid "Invalid token."
-msgstr "Tamanho inválido."
+msgstr "Chave inválida."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -543,31 +536,28 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
#: actions/apioauthauthorize.php:135
-#, fuzzy
msgid "Invalid nickname / password!"
-msgstr "Nome de utilizador ou senha inválidos."
+msgstr "Alcunha ou senha inválidos!"
#: actions/apioauthauthorize.php:159
-#, fuzzy
msgid "Database error deleting OAuth application user."
-msgstr "Erro ao configurar utilizador."
+msgstr "Erro na base de dados ao apagar o utilizador da aplicação OAuth."
#: actions/apioauthauthorize.php:185
-#, fuzzy
msgid "Database error inserting OAuth application user."
-msgstr "Erro na base de dados ao inserir a marca: %s"
+msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
#: actions/apioauthauthorize.php:214
#, php-format
msgid ""
"The request token %s has been authorized. Please exchange it for an access "
"token."
-msgstr ""
+msgstr "A chave de pedido %s foi autorizada. Troque-a por uma chave de acesso."
#: actions/apioauthauthorize.php:227
#, php-format
msgid "The request token %s has been denied and revoked."
-msgstr ""
+msgstr "A chave de pedido %s foi negada e retirada."
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
@@ -583,11 +573,11 @@ msgstr "Envio inesperado de formulário."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Uma aplicação pretende ligar-se à sua conta"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "Permitir ou negar acesso"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -596,14 +586,17 @@ msgid ""
"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
"give access to your %4$s account to third parties you trust."
msgstr ""
+"A aplicação <strong>%1$s</strong> por <strong>%2$s</strong> solicita "
+"permissão para <strong>%3$s</strong> os dados da sua conta %4$s. Só deve "
+"permitir acesso à sua conta %4$s a terceiros da sua confiança."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,37 +604,35 @@ msgid "Nickname"
msgstr "Utilizador"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Senha"
#: actions/apioauthauthorize.php:328
-#, fuzzy
msgid "Deny"
-msgstr "Estilo"
+msgstr "Negar"
#: actions/apioauthauthorize.php:334
-#, fuzzy
msgid "Allow"
-msgstr "Todas"
+msgstr "Permitir"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "Permitir ou negar acesso à informação da sua conta."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método requer um POST ou DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Não pode apagar o estado de outro utilizador."
#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
-msgstr "Nota não encontrada."
+msgstr "Nota não foi encontrada."
#: actions/apistatusesretweet.php:83
msgid "Cannot repeat your own notice."
@@ -651,25 +642,25 @@ msgstr "Não pode repetir a sua própria nota."
msgid "Already repeated that notice."
msgstr "Já repetiu essa nota."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Estado apagado."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Não foi encontrado um estado com esse ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Não encontrado."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
@@ -678,32 +669,32 @@ msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
msgid "Unsupported format."
msgstr "Formato não suportado."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizações preferidas por %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Actualizações que mencionam %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Notas públicas de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizações de todos!"
@@ -718,26 +709,26 @@ msgstr "Repetida para %s"
msgid "Repeats of %s"
msgstr "Repetições de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notas categorizadas com %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizações categorizadas com %1$s em %2$s!"
#: actions/attachment.php:73
msgid "No such attachment."
-msgstr "Anexo não encontrado."
+msgstr "Anexo não foi encontrado."
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
#: actions/grouplogo.php:86 actions/groupmembers.php:76
#: actions/grouprss.php:91 actions/showgroup.php:121
msgid "No nickname."
-msgstr "Nenhuma utilizador."
+msgstr "Alcunha não definida."
#: actions/avatarbynickname.php:64
msgid "No size."
@@ -780,7 +771,7 @@ msgid "Preview"
msgstr "Antevisão"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Apagar"
@@ -793,9 +784,8 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "Não foi especificado um perfil."
+msgstr "Não foi carregado nenhum ficheiro."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -821,11 +811,11 @@ msgstr "Avatar apagado."
msgid "You already blocked that user."
msgstr "Já bloqueou esse utilizador."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear utilizador"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -840,17 +830,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este utilizador"
@@ -859,20 +848,19 @@ msgstr "Não bloquear este utilizador"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este utilizador"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
@@ -918,9 +906,9 @@ msgstr "Desbloquear este utilizador"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Publicar em "
+msgstr "Publicar em %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -936,9 +924,9 @@ msgstr "Esse código de confirmação não é para si!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Tipo do endereço %s não reconhecido"
+msgstr "Tipo do endereço %s não reconhecido."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -967,9 +955,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Não foi possível apagar a confirmação do endereço electrónico."
#: actions/confirmaddress.php:146
-#, fuzzy
msgid "Confirm address"
-msgstr "Confirmar Endereço"
+msgstr "Confirmar endereço"
#: actions/confirmaddress.php:161
#, php-format
@@ -986,53 +973,47 @@ msgid "Notices"
msgstr "Notas"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para eliminar uma aplicação."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "Nota não tem perfil"
+msgstr "Aplicação não foi encontrada."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
-#, fuzzy
msgid "You are not the owner of this application."
-msgstr "Não é membro deste grupo."
+msgstr "Não é o proprietário desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "Nota não encontrada."
+msgstr "Apagar aplicação"
#: actions/deleteapplication.php:149
-#, fuzzy
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 ""
-"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
-"utilizador serão eliminados da base de dados, sem haver cópias."
+"Tem a certeza de que quer apagar esta aplicação? Todos os dados da aplicação "
+"serão eliminados da base de dados, incluindo todas as ligações de "
+"utilizadores em existência."
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "Não apagar esta nota"
+msgstr "Não apagar esta aplicação"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
-#, fuzzy
msgid "Delete this application"
-msgstr "Apagar esta nota"
+msgstr "Apagar esta aplicação"
#. 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
@@ -1040,7 +1021,7 @@ msgstr "Apagar esta nota"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Não iniciou sessão."
@@ -1071,7 +1052,7 @@ msgid "Do not delete this notice"
msgstr "Não apagar esta nota"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Apagar esta nota"
@@ -1111,45 +1092,54 @@ msgstr "Estilo"
msgid "Design settings for this StatusNet site."
msgstr "Configurações do estilo deste site StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "URL do logotipo inválida."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema não está disponível: %s"
+msgstr "Tema não está disponível: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Alterar logotipo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logotipo do site"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Alterar tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Tema do site"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "O tema para o site."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Tema do site"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Alterar imagem de fundo"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1159,57 +1149,65 @@ msgstr ""
"é %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Ligar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Desligar"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Ligar ou desligar a imagem de fundo."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Repetir imagem de fundo em mosaico"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Alterar cores"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Conteúdo"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
-msgstr "Ligações"
+msgstr "Links"
+
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar predefinições"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Repor estilos predefinidos"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Repor predefinição"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1219,7 +1217,7 @@ msgstr "Repor predefinição"
msgid "Save"
msgstr "Gravar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Gravar o estilo"
@@ -1232,86 +1230,74 @@ msgid "Add to favorites"
msgstr "Adicionar às favoritas"
#: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
msgid "No such document \"%s\""
-msgstr "Documento não encontrado."
+msgstr "Documento \"%s\" não foi encontrado"
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "Outras opções"
+msgstr "Editar Aplicação"
#: actions/editapplication.php:66
-#, fuzzy
msgid "You must be logged in to edit an application."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para editar uma aplicação."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
-#, fuzzy
msgid "No such application."
-msgstr "Nota não encontrada."
+msgstr "Aplicação não foi encontrada."
#: actions/editapplication.php:161
-#, fuzzy
msgid "Use this form to edit your application."
-msgstr "Use este formulário para editar o grupo."
+msgstr "Use este formulário para editar a sua aplicação."
#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
msgid "Name is required."
-msgstr "Repita a senha acima. Obrigatório."
+msgstr "Nome é obrigatório."
#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
msgid "Name is too long (max 255 chars)."
-msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
+msgstr "Nome é demasiado longo (máx. 255 caracteres)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
-msgstr "Utilizador já é usado. Tente outro."
+msgstr "Nome já é usado. Tente outro."
#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
msgid "Description is required."
-msgstr "Descrição"
+msgstr "Descrição é obrigatória."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "URL de origem é demasiado longa."
#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
msgid "Source URL is not valid."
-msgstr "A URL ‘%s’ do avatar é inválida."
+msgstr "A URL de origem é inválida."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "Organização é obrigatória."
#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
msgid "Organization is too long (max 255 chars)."
-msgstr "Localidade demasiado longa (máx. 255 caracteres)."
+msgstr "Organização é demasiado longa (máx. 255 caracteres)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "Página da organização é obrigatória."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
-msgstr ""
+msgstr "Callback é demasiado longo."
#: actions/editapplication.php:225 actions/newapplication.php:215
-#, fuzzy
msgid "Callback URL is not valid."
-msgstr "A URL ‘%s’ do avatar é inválida."
+msgstr "A URL de callback é inválida."
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não foi possível actualizar a aplicação."
#: actions/editgroup.php:56
#, php-format
@@ -1339,7 +1325,7 @@ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
#: actions/editgroup.php:228 actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Sinónimo inválido: \"%s\""
+msgstr "Nome alternativo inválido: \"%s\""
#: actions/editgroup.php:258
msgid "Could not update group."
@@ -1347,7 +1333,7 @@ msgstr "Não foi possível actualizar o grupo."
#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
-msgstr "Não foi possível criar sinónimos."
+msgstr "Não foi possível criar os nomes alternativos."
#: actions/editgroup.php:280
msgid "Options saved."
@@ -1384,7 +1370,6 @@ msgstr "Endereço de correio já confirmado."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
@@ -1403,7 +1388,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1419,7 +1403,6 @@ msgstr ""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Adicionar"
@@ -1445,16 +1428,14 @@ msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferências"
+msgstr "Preferências de correio electrónico"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1478,7 +1459,7 @@ msgstr ""
#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-"Enviem-me notificação electrónica quando me enviarem uma \"@-resposta\"."
+"Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:205
@@ -1497,9 +1478,8 @@ msgstr "Publicar uma MicroID para o meu endereço electrónico."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Preferências de estilo foram gravadas."
+msgstr "Preferências de correio electrónico foram gravadas."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1512,7 +1492,7 @@ msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
@@ -1555,15 +1535,13 @@ msgstr "Nenhuma confirmação pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Esse endereço de mensagens instantâneas está errado."
+msgstr "Esse endereço de correio electrónico está errado."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "Confirmação de correio electrónico cancelada."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1573,9 +1551,8 @@ msgstr "Esse não é o seu endereço electrónico."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "O endereço foi removido."
+msgstr "O endereço de correio electrónico foi removido."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1713,9 +1690,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Erro ao actualizar o perfil remoto"
+msgstr "Erro ao actualizar o perfil remoto."
#: actions/getfile.php:79
msgid "No such file."
@@ -1726,33 +1702,30 @@ msgid "Cannot read file."
msgstr "Não foi possível ler o ficheiro."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Tamanho inválido."
+msgstr "Função inválida."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Esta função está reservada e não pode ser activada."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "Não pode impedir notas públicas neste site."
+msgstr "Não pode atribuir funções aos utilizadores neste site."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "O utilizador já está silenciado."
+msgstr "O utilizador já tem esta função."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Não foi especificado um perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Não foi encontrado um perfil com essa identificação."
@@ -1808,7 +1781,7 @@ msgstr "Sem ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para editar um grupo."
#: actions/groupdesignsettings.php:144
msgid "Group design"
@@ -1893,7 +1866,7 @@ msgstr "Tornar este utilizador um gestor"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Notas de %s"
@@ -2039,9 +2012,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferências"
+msgstr "Preferências de MI"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2111,15 +2083,13 @@ msgstr "Esse endereço de mensagens instantâneas está errado."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Não foi possível apagar a confirmação do endereço electrónico."
+msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "Confirmação do mensageiro instantâneo cancelada."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2129,14 +2099,13 @@ msgstr "Esse não é o seu Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "O endereço foi removido."
+msgstr "O endereço do mensageiro instantâneo foi removido."
#: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr "Caixa de entrada de %s"
+msgstr "Caixa de entrada de %s - página %2$d"
#: actions/inbox.php:62
#, php-format
@@ -2154,11 +2123,11 @@ msgid "Invites have been disabled."
msgstr "Convites foram desabilitados."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr ""
-"Precisa de iniciar uma sessão para convidar outros utilizadores a usarem o "
-"site %s."
+"Tem de iniciar uma sessão para convidar outros utilizadores a usarem o site %"
+"s."
#: actions/invite.php:72
#, php-format
@@ -2226,7 +2195,6 @@ msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
@@ -2296,12 +2264,11 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr "Precisa de iniciar uma sessão para se juntar a um grupo."
+msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "Nenhuma utilizador."
+msgstr "Nenhuma alcunha ou utilizador."
#. 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.
@@ -2312,7 +2279,7 @@ msgstr "%1$s juntou-se ao grupo %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr "Precisa de iniciar uma sessão para deixar um grupo."
+msgstr "Tem de iniciar uma sessão para deixar um grupo."
#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
@@ -2325,41 +2292,41 @@ msgstr "Não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sessão já foi iniciada."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de utilizador ou senha incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrar-me neste computador"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"De futuro, iniciar sessão automaticamente. Não usar em computadores "
"partilhados!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu-se da senha?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2367,14 +2334,15 @@ msgstr ""
"Por razões de segurança, por favor re-introduza o seu nome de utilizador e "
"senha antes de alterar as configurações."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Iniciar sessão com um nome de utilizador e senha."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
-msgstr ""
-"Entrar com o seu nome de utilizador e senha. Ainda não está registado? "
-"[Registe](%%action.register%%) uma conta."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "Ainda não está registado? [Registe](%%action.register%%) uma conta."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2396,33 +2364,28 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Não é possível tornar %1$s administrador do grupo %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Sem estado actual"
+msgstr "Sem estado actual."
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "Nota não encontrada."
+msgstr "Aplicação Nova"
#: actions/newapplication.php:64
-#, fuzzy
msgid "You must be logged in to register an application."
-msgstr "Tem de iniciar uma sessão para criar o grupo."
+msgstr "Tem de iniciar uma sessão para registar uma aplicação."
#: actions/newapplication.php:143
-#, fuzzy
msgid "Use this form to register a new application."
-msgstr "Use este formulário para criar um grupo novo."
+msgstr "Use este formulário para registar uma nova aplicação."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "É necessária a URL de origem."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "Não foi possível criar sinónimos."
+msgstr "Não foi possível criar a aplicação."
#: actions/newgroup.php:53
msgid "New group"
@@ -2537,75 +2500,72 @@ msgid "Nudge sent!"
msgstr "Toque enviado!"
#: actions/oauthappssettings.php:59
-#, fuzzy
msgid "You must be logged in to list your applications."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para listar as suas aplicações."
#: actions/oauthappssettings.php:74
-#, fuzzy
msgid "OAuth applications"
-msgstr "Outras opções"
+msgstr "Aplicações OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Aplicações que registou"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Ainda não registou nenhuma aplicação."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Aplicações ligadas"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "Permitiu que as seguintes aplicações acedam à sua conta."
#: actions/oauthconnectionssettings.php:175
-#, fuzzy
msgid "You are not a user of that application."
-msgstr "Não é um membro desse grupo."
+msgstr "Não é utilizador dessa aplicação."
#: actions/oauthconnectionssettings.php:186
#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr ""
+msgstr "Não foi possível retirar acesso da aplicação: %s"
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "Não permitiu que nenhuma aplicação use a sua conta."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
+"Programadores podem editar as configurações de inscrição das suas aplicações "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Nota não tem perfil"
+msgstr "Nota não tem perfil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s em %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "tipo de conteúdo "
+msgstr "O tipo de conteúdo %s não é suportado."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Só URLs %s sobre HTTP simples, por favor."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2618,9 +2578,8 @@ msgid "Notice Search"
msgstr "Pesquisa de Notas"
#: actions/othersettings.php:60
-#, fuzzy
msgid "Other settings"
-msgstr "Outras Configurações"
+msgstr "Outras configurações"
#: actions/othersettings.php:71
msgid "Manage various other options."
@@ -2651,34 +2610,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Não foi especificado um grupo."
+msgstr "Não foi especificado um ID de utilizador."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Nota não foi especificada."
+msgstr "Chave de entrada não foi especificada."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "O pedido não tem a identificação do perfil."
+msgstr "Chave de entrada não foi pedida."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Chave inválida ou expirada."
+msgstr "Chave de entrada especificada é inválida."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Iniciar sessão no site"
+msgstr "Chave de entrada expirou."
#: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
msgid "Outbox for %1$s - page %2$d"
-msgstr "Caixa de saída de %s"
+msgstr "Caixa de saída de %s - página %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2715,7 +2669,7 @@ msgid "6 or more characters"
msgstr "6 ou mais caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmação"
@@ -2727,11 +2681,11 @@ msgstr "Repita a senha nova"
msgid "Change"
msgstr "Modificar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Senha tem de ter 6 ou mais caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Senhas não coincidem."
@@ -2752,7 +2706,7 @@ msgid "Password saved."
msgstr "Senha gravada."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Localizações"
@@ -2761,24 +2715,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Configurações de localização e servidor deste site StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Sem acesso de leitura do directório do tema: %s"
+msgstr "Sem acesso de leitura do directório do tema: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Sem acesso de escrita no directório do avatar: %s"
+msgstr "Sem acesso de escrita no directório do avatar: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Sem acesso de escrita no directório do fundo: %s"
+msgstr "Sem acesso de escrita no directório do fundo: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Sem acesso de leitura ao directório de idiomas: %s"
+msgstr "Sem acesso de leitura ao directório de idiomas: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2919,9 +2873,9 @@ msgid "People search"
msgstr "Pesquisa de pessoas"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Categoria de pessoas inválida: %s"
+msgstr "Categoria de pessoas inválida: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2929,9 +2883,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Conteúdo da nota é inválido"
+msgstr "Conteúdo da nota é inválido."
#: actions/postnotice.php:101
#, php-format
@@ -2958,43 +2911,43 @@ msgstr "Informação do perfil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página pessoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descreva-se e aos seus interesses (máx. 140 caracteres)"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descreva-se e aos seus interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localidade"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está, por ex. \"Cidade, Região, País\""
@@ -3017,11 +2970,11 @@ msgstr ""
#: actions/profilesettings.php:151
msgid "Language"
-msgstr "Idioma"
+msgstr "Língua"
#: actions/profilesettings.php:152
msgid "Preferred language"
-msgstr "Idioma preferido"
+msgstr "Língua preferida"
#: actions/profilesettings.php:161
msgid "Timezone"
@@ -3036,7 +2989,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografia demasiado extensa (máx. %d caracteres)."
@@ -3047,7 +3000,7 @@ msgstr "Fuso horário não foi seleccionado."
#: actions/profilesettings.php:241
msgid "Language is too long (max 50 chars)."
-msgstr "Idioma é demasiado extenso (máx. 50 caracteres)."
+msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
@@ -3076,9 +3029,9 @@ msgid "Settings saved."
msgstr "Configurações gravadas."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Além do limite de página (%s)"
+msgstr "Além do limite de página (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3187,7 +3140,7 @@ msgstr "Já tem uma sessão iniciada!"
#: actions/recoverpassword.php:62
msgid "No such recovery code."
-msgstr "Esse código de recuperação não existe."
+msgstr "Código de recuperação não foi encontrado."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
@@ -3301,7 +3254,7 @@ msgstr "Senha tem de ter 6 ou mais caracteres."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
@@ -3309,40 +3262,39 @@ msgstr "Erro ao configurar utilizador."
msgid "New password successfully saved. You are now logged in."
msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpe, só pessoas convidadas se podem registar."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Desculpe, código de convite inválido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registo não é permitido."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Não se pode registar se não aceita a licença."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Correio electrónico já existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nome de utilizador ou senha inválidos."
-#: actions/register.php:343
-#, fuzzy
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3350,43 +3302,70 @@ msgstr ""
"Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
"ligar-se a amigos e colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou mais caracteres. Obrigatório."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Repita a senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correio"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+"Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+"Os meus textos e ficheiros permanecem protegidos pelos meus próprios "
+"direitos de autor."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Todos os direitos reservados."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-" excepto estes dados privados: senha, endereço de correio electrónico, "
-"endereço de mensageiro instantâneo, número de telefone."
+"Os meus textos e ficheiros são disponibilizados nos termos da %s excepto "
+"estes dados privados: senha, endereço de correio electrónico, endereço de "
+"mensageiro instantâneo, número de telefone."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3419,7 +3398,7 @@ msgstr ""
"\n"
"Obrigado por se ter registado e esperamos que se divirta usando este serviço."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3502,7 +3481,7 @@ msgstr "Não pode repetir a sua própria nota."
msgid "You already repeated that notice."
msgstr "Já repetiu essa nota."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetida"
@@ -3517,9 +3496,9 @@ msgid "Replies to %s"
msgstr "Respostas a %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "Respostas a %1$s em %2$s!"
+msgstr "Respostas a %1$s, página %2$d"
#: actions/replies.php:145
#, php-format
@@ -3569,16 +3548,14 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Respostas a %1$s em %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Não pode silenciar utilizadores neste site."
+msgstr "Não pode retirar funções aos utilizadores neste site."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Utilizador sem perfil correspondente."
+msgstr "O utilizador não tem esta função."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3592,14 +3569,13 @@ msgstr "Utilizador já está impedido de criar notas públicas."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessões"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "Configurações do estilo deste site StatusNet."
+msgstr "Configurações da sessão para este site StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3623,34 +3599,31 @@ msgid "Save site settings"
msgstr "Gravar configurações do site"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "Precisa de iniciar uma sessão para deixar um grupo."
+msgstr "Tem de iniciar uma sessão para ver uma aplicação."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Nota não tem perfil"
+msgstr "Perfil da aplicação"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Ãcone"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nome"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
msgid "Organization"
-msgstr "Paginação"
+msgstr "Organização"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Descrição"
@@ -3663,56 +3636,57 @@ msgstr "Estatísticas"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Operações da aplicação"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Reiniciar chave e segredo"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Informação da aplicação"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Chave do consumidor"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Segredo do consumidor"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "URL da chave de pedido"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "URL da chave de acesso"
#: actions/showapplication.php:283
-#, fuzzy
msgid "Authorize URL"
-msgstr "Autor"
+msgstr "Autorizar URL"
#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto "
+"simples não é suportado."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Tem a certeza de que quer apagar esta nota?"
+msgstr ""
+"Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "Notas favoritas de %s"
+msgstr "Notas favoritas de %1$s, página %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3772,9 +3746,9 @@ msgid "%s group"
msgstr "Grupo %s"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "Membros do grupo %1$s, página %2$d"
+msgstr "Grupo %1$s, página %2$d"
#: actions/showgroup.php:227
msgid "Group profile"
@@ -3792,7 +3766,7 @@ msgstr "Anotação"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
-msgstr "Sinónimos"
+msgstr "Nomes alternativos"
#: actions/showgroup.php:302
msgid "Group actions"
@@ -3897,9 +3871,9 @@ msgid " tagged %s"
msgstr " categorizou %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "Perfis bloqueados de %1$s, página %2$d"
+msgstr "%1$s, página %2$d"
#: actions/showstream.php:122
#, php-format
@@ -3987,9 +3961,8 @@ msgid "User is already silenced."
msgstr "O utilizador já está silenciado."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Configurações básicas para este site StatusNet."
+msgstr "Configurações básicas para este site StatusNet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
@@ -4005,14 +3978,12 @@ msgid "Unknown language \"%s\"."
msgstr "Língua desconhecida \"%s\"."
#: actions/siteadminpanel.php:165
-#, fuzzy
msgid "Minimum text limit is 0 (unlimited)."
-msgstr "O valor mínimo de limite para o texto é 140 caracteres."
+msgstr "O limite mínimo para o texto é 0 (sem limite)."
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
-msgstr "O limite de duplicados tem de ser 1 ou mais segundos."
+msgstr "O limite de duplicados tem de ser um ou mais segundos."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -4059,13 +4030,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horário por omissão, para o site; normalmente, UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Idioma do site, por omissão"
+msgstr "Língua, por omissão"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Língua do site quando a sua detecção na configuração do browser não é "
+"possível"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -4090,37 +4062,32 @@ msgstr ""
"mesma coisa outra vez."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Aviso do site"
+msgstr "Aviso do Site"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Mensagem nova"
+msgstr "Editar mensagem do site"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Não foi possível gravar as configurações do estilo."
+msgstr "Não foi possível gravar o aviso do site."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "Tamanho máximo do aviso do site é 255 caracteres."
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Aviso do site"
+msgstr "Texto do aviso do site"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Aviso do site"
+msgstr "Gravar aviso do site"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4141,9 +4108,8 @@ msgstr "SMS não está disponível."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Endereço IM"
+msgstr "Endereço SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4167,10 +4133,9 @@ msgstr "Introduza o código que recebeu no seu telefone."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
-msgstr "Confirmação"
+msgstr "Confirmar"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
@@ -4184,9 +4149,8 @@ msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferências"
+msgstr "Preferências de SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4199,9 +4163,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferências gravadas."
+msgstr "Preferências de SMS gravadas."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4240,9 +4203,8 @@ msgstr "Esse número de confirmação está errado."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "Confirmação de SMS cancelada."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4252,9 +4214,8 @@ msgstr "Esse número de telefone não é o seu."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Número de telefone para SMS"
+msgstr "Número de telefone para SMS foi removido."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4285,14 +4246,13 @@ msgstr "Nenhum código introduzido"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Instantâneos"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Alterar a configuração do site"
+msgstr "Alterar a configuração do instantâneo"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4307,7 +4267,6 @@ msgid "Invalid snapshot report URL."
msgstr "URL para onde enviar instantâneos é inválida"
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "Aleatoriamente, durante o acesso pela internet"
@@ -4340,9 +4299,8 @@ msgid "Snapshots will be sent to this URL"
msgstr "Instantâneos serão enviados para esta URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Gravar configurações do site"
+msgstr "Gravar configurações do instantâneo"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
@@ -4354,17 +4312,15 @@ msgstr "Não foi possível gravar a subscrição."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Esta operação só aceita pedidos POST."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Ficheiro não foi encontrado."
+msgstr "Perfil não foi encontrado."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Não subscreveu esse perfil."
+msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4460,9 +4416,9 @@ msgid "SMS"
msgstr "SMS"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
+msgstr "Notas categorizadas com %1$s, página %2$d"
#: actions/tag.php:87
#, php-format
@@ -4526,7 +4482,7 @@ msgstr ""
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr "Categoria não existe."
+msgstr "Categoria não foi encontrada."
#: actions/twitapitrends.php:85
msgid "API method under construction."
@@ -4545,7 +4501,6 @@ msgid "User is not silenced."
msgstr "Utilizador não está silenciado."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "O pedido não tem a identificação do perfil."
@@ -4563,7 +4518,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Utilizador"
@@ -4645,7 +4599,7 @@ msgstr ""
"subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
"as notas de alguém, simplesmente clique \"Rejeitar\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licença"
@@ -4751,9 +4705,9 @@ msgstr "Disfrute do seu cachorro-quente!"
#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
#: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "Membros do grupo %1$s, página %2$d"
+msgstr "Grupos de %1$s, página %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
@@ -4774,18 +4728,18 @@ msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles."
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Actualizações de %1#s a %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4794,11 +4748,11 @@ msgstr ""
"Este site utiliza o %1$s versão %2$s, (c) 2008-2010 StatusNet, Inc. e "
"colaboradores."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Colaboradores"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4810,7 +4764,7 @@ msgstr ""
"Software Foundation, que na versão 3 da Licença, quer (por sua opção) "
"qualquer versão posterior. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4821,7 +4775,7 @@ msgstr ""
"QUALQUER GARANTIA. Consulte a GNU Affero General Public License para mais "
"informações. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4830,20 +4784,20 @@ msgstr ""
"Juntamente com este programa deve ter recebido uma cópia da GNU Affero "
"General Public License. Se não a tiver recebido, consulte %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Plugins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Versão"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autores"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4852,36 +4806,32 @@ msgstr ""
"Nenhum ficheiro pode ter mais de %d bytes e o que enviou tinha %d bytes. "
"Tente carregar uma versão menor."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
"Um ficheiro desta dimensão excederia a sua quota de utilizador de %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Perfil do grupo"
+msgstr "Entrada no grupo falhou."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não faz parte do grupo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Perfil do grupo"
+msgstr "Saída do grupo falhou."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não foi possível actualizar o grupo local."
#: classes/Login_token.php:76
#, php-format
@@ -4901,27 +4851,27 @@ msgid "Could not update message with new URI."
msgstr "Não foi possível actualizar a mensagem com a nova URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Erro na base de dados ao inserir a marca: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problema na gravação da nota. Demasiado longa."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problema na gravação da nota. Utilizador desconhecido."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a "
"alguns minutos."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4929,22 +4879,21 @@ msgstr ""
"Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
"publicar daqui a alguns minutos."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Está proibido de publicar notas neste site."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:965
-#, fuzzy
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
-msgstr "Problema na gravação da nota."
+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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4970,9 +4919,8 @@ msgid "Couldn't delete self-subscription."
msgstr "Não foi possível apagar a auto-subscrição."
#: classes/Subscription.php:200
-#, fuzzy
msgid "Couldn't delete subscription OMB token."
-msgstr "Não foi possível apagar a subscrição."
+msgstr "Não foi possível apagar a chave de subscrição OMB."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
@@ -4988,18 +4936,16 @@ msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
#: classes/User_group.php:489
-#, fuzzy
msgid "Could not set group URI."
-msgstr "Não foi possível configurar membros do grupo."
+msgstr "Não foi possível configurar a URI do grupo."
#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Não foi possível configurar membros do grupo."
#: classes/User_group.php:524
-#, fuzzy
msgid "Could not save local group info."
-msgstr "Não foi possível gravar a subscrição."
+msgstr "Não foi possível gravar a informação do grupo local."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
@@ -5038,9 +4984,9 @@ msgstr "Outras"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:145
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
#: lib/action.php:161
@@ -5048,221 +4994,204 @@ msgid "Untitled page"
msgstr "Página sem título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
-#, fuzzy
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ligar aos serviços"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Ligar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
-#, fuzzy
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
-#, fuzzy
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Gestor"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
-#, fuzzy, php-format
+#: lib/action.php:465
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
-#, fuzzy
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
-#, fuzzy
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar esta sessão"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
-#, fuzzy
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
-#, fuzzy
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
-#, fuzzy
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:481
-#, fuzzy
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
-#, fuzzy
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:487
-#, fuzzy
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
-#, fuzzy
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:493
-#, fuzzy
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisa"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Aviso do site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Aviso da página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "Termos"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Código"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Emblema"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é um serviço de microblogues."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5274,68 +5203,76 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licença de conteúdos do site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
+"Direitos de autor sobre o conteúdo e dados, detidos por %1$s. Todos os "
+"direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
+"Todos os direitos reservados."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+"Todo o conteúdo e dados do site %1$s são disponibilizados nos termos da "
+"licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Anteriores"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
+"inteiro."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "Ainda não é possível processar conteúdos remotos."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Ainda não é possível processar conteúdo XML embutido."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Ainda não é possível processar conteúdo Base64 embutido."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
@@ -5364,153 +5301,142 @@ msgid "Unable to delete design setting."
msgstr "Não foi possível apagar a configuração do estilo."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configuração básica do site"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
-#, fuzzy
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configuração do estilo"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
-#, fuzzy
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Estilo"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
-#, fuzzy
+#: lib/adminpanelaction.php:366
msgid "User configuration"
-msgstr "Configuração das localizações"
+msgstr "Configuração do utilizador"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Utilizador"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
-#, fuzzy
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
-msgstr "Configuração do estilo"
+msgstr "Configuração de acesso"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configuração das localizações"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
-#, fuzzy
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
-msgstr "Configuração do estilo"
+msgstr "Configuração das sessões"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
-#, fuzzy
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
-msgstr "Aviso do site"
+msgstr "Editar aviso do site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
-#, fuzzy
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
-msgstr "Configuração das localizações"
+msgstr "Configuração dos instântaneos"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
-msgstr ""
+msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura."
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "Editar aplicação"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Ãcone para esta aplicação"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d characters"
-msgstr "Descreva o grupo ou o assunto em %d caracteres"
+msgstr "Descreva a sua aplicação em %d caracteres"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
-#, fuzzy
msgid "Describe your application"
-msgstr "Descreva o grupo ou assunto"
+msgstr "Descreva a sua aplicação"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
-#, fuzzy
msgid "URL of the homepage of this application"
-msgstr "URL da página ou do blogue, deste grupo ou assunto"
+msgstr "URL da página desta aplicação"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
-#, fuzzy
msgid "Source URL"
-msgstr "Código"
+msgstr "URL de origem"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organização responsável por esta aplicação"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
-#, fuzzy
msgid "URL for the homepage of the organization"
-msgstr "URL da página ou do blogue, deste grupo ou assunto"
+msgstr "URL da página desta organização"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL para onde reencaminhar após autenticação"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Browser"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "Desktop"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipo da aplicação, browser ou desktop"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "Leitura"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "Leitura e escrita"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
msgid "Default access for this application: read-only, or read-write"
-msgstr ""
+msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita"
#. TRANS: Submit button title
#: lib/applicationeditform.php:359
@@ -5520,25 +5446,24 @@ msgstr "Cancelar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "leitura e escrita"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "leitura"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprovado a %1$s - acesso \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Remover"
+msgstr "Retirar"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5563,11 +5488,11 @@ msgstr "Notas em que este anexo aparece"
msgid "Tags for this attachment"
msgstr "Categorias para este anexo"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Não foi possível mudar a palavra-chave"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Não é permitido mudar a palavra-chave"
@@ -5601,9 +5526,9 @@ msgstr "Não foi encontrado um utilizador com a alcunha %s"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
#: lib/command.php:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "Não foi encontrado um utilizador com a alcunha %s"
+msgstr "Não foi encontrado um utilizador local com a alcunha %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
@@ -5649,9 +5574,9 @@ msgstr "Não foi possível juntar o utilizador %1$s ao grupo %2$s"
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Não foi possível remover %1$s do grupo %2$s."
+msgstr "Não foi possível remover %1$s do grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5661,14 +5586,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Página pessoal: %s"
@@ -5685,13 +5610,15 @@ msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
+"%s é um perfil remoto; só pode enviar mensagens directas a utilizadores no "
+"mesmo servidor."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5742,9 +5669,8 @@ msgid "Specify the name of the user to subscribe to"
msgstr "Introduza o nome do utilizador para subscrever"
#: lib/command.php:628
-#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
-msgstr "Não subscreveu esse perfil."
+msgstr "Não pode subscrever perfis OMB por comando."
#: lib/command.php:634
#, php-format
@@ -5792,9 +5718,9 @@ msgstr ""
"s"
#: lib/command.php:761
-#, fuzzy, php-format
+#, php-format
msgid "Unsubscribed %s"
-msgstr "Deixou de subscrever %s"
+msgstr "Deixou de subscrever %s"
#: lib/command.php:778
msgid "You are not subscribed to anyone."
@@ -5827,7 +5753,6 @@ msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
#: lib/command.php:838
-#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5880,6 +5805,7 @@ msgstr ""
"d <utilizador> <texto> - mensagem directa para o utilizador\n"
"get <utilizador> - receber última nota do utilizador\n"
"whois <utilizador> - receber perfil do utilizador\n"
+"lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
"fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
"fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
"repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
@@ -5935,13 +5861,12 @@ msgid "Updates by SMS"
msgstr "Actualizações por SMS"
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgid "Connections"
-msgstr "Ligar"
+msgstr "Ligações"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Aplicações ligadas autorizadas"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -6021,7 +5946,7 @@ msgstr "Prosseguir"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Atribuir a este utilizador a função \"%s\""
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -6140,9 +6065,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:567
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Língua desconhecida \"%s\"."
+msgstr "Origem da caixa de entrada desconhecida \"%s\"."
#: lib/joinform.php:114
msgid "Join"
@@ -6201,8 +6126,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está agora a ouvir as suas notas em %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Se acredita que esta conta está sendo usada abusivamente pode bloqueá-la da "
+"sua lista de subscritores e reportá-la como spam aos administradores do site "
+"em %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6229,19 +6164,19 @@ msgstr ""
"8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço electrónico para publicar no site %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6263,30 +6198,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmação SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "A aguardar confirmação deste número de telefone."
+msgstr "%s: confirme que este número de telefone é seu com este código:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s envia-lhe um toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6314,13 +6249,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem privada de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6354,13 +6289,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) adicionou a sua nota às favoritas."
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6398,21 +6333,24 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"O diálogo completo pode ser lido aqui:\n"
+"\n"
+"\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma nota à sua atenção"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6438,6 +6376,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma 'resposta-@') em %2"
+"$s.\n"
+"\n"
+"A nota está aqui:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Diz:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sPode responder aqui:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"A lista de todas as respostas-@ aqui:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Atenciosamente,\n"
+"%2$s\n"
+"\n"
+"P.S. Pode desligar estas notificações electrónicas aqui: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6452,7 +6413,7 @@ msgstr ""
"conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
"só você terá acesso."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "de"
@@ -6546,7 +6507,6 @@ msgid "Available characters"
msgstr "Caracteres disponíveis"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
@@ -6573,15 +6533,16 @@ msgid "Share my location"
msgstr "Partilhar a minha localização."
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Não partilhar a minha localização."
+msgstr "Não partilhar a minha localização"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"A obtenção da sua geolocalização está a demorar mais do que o esperado; "
+"tente novamente mais tarde"
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
@@ -6612,23 +6573,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "coords."
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder a esta nota"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Nota repetida"
@@ -6701,7 +6662,7 @@ msgstr "Mensagens enviadas"
msgid "Tags in %s's notices"
msgstr "Categorias nas notas de %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Desconhecida"
@@ -6723,7 +6684,7 @@ msgstr "Todos os subscritores"
#: lib/profileaction.php:191
msgid "User ID"
-msgstr "ID do utilizador"
+msgstr "Número de identificação"
#: lib/profileaction.php:196
msgid "Member since"
@@ -6732,13 +6693,13 @@ msgstr "Membro desde"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Média diária"
#: lib/profileaction.php:264
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6762,7 +6723,7 @@ msgstr "Destaques"
msgid "Popular"
msgstr "Populares"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sem argumentos return-to."
@@ -6779,13 +6740,13 @@ msgid "Repeat this notice"
msgstr "Repetir esta nota"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Bloquear acesso deste utilizador a este grupo"
+msgstr "Retirar a função \"%s\" a este utilizador"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Nenhum utilizador único definido para o modo de utilizador único."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -6881,6 +6842,51 @@ msgstr "Nuvem da sua categorização das pessoas"
msgid "None"
msgstr "Nenhum"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Falha ao actualizar avatar."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Erro ao actualizar o perfil remoto."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Quem mais publica"
@@ -6910,9 +6916,9 @@ msgid "Unsubscribe"
msgstr "Abandonar"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "Utilizador não tem perfil."
+msgstr "Utilizador %s (%d) não tem perfil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6924,7 +6930,7 @@ msgstr "Acções do utilizador"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "A apagar o utilizador..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
@@ -6947,73 +6953,70 @@ msgid "Moderate"
msgstr "Moderar"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "Perfil"
+msgstr "Função"
#: lib/userprofile.php:366
-#, fuzzy
msgctxt "role"
msgid "Administrator"
-msgstr "Gestores"
+msgstr "Gestor"
#: lib/userprofile.php:367
-#, fuzzy
msgctxt "role"
msgid "Moderator"
-msgstr "Moderar"
+msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "há alguns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "há cerca de um minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "há cerca de uma hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "há cerca de um dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "há cerca de um mês"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index b506f7f29..a12a309f3 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:42+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:52+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -25,7 +25,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Acesso"
@@ -87,25 +87,24 @@ msgid "Save"
msgstr "Salvar"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "Esta página não existe."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -118,7 +117,7 @@ msgid "No such user."
msgstr "Este usuário não existe."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amigos, pág. %2$d"
@@ -126,33 +125,33 @@ msgstr "%1$s e amigos, pág. %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s e amigos"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Fonte de mensagens dos amigos de %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Fonte de mensagens dos amigos de %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Fonte de mensagens dos amigos de %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -160,7 +159,7 @@ msgstr ""
"Esse é o fluxo de mensagens de %s e seus amigos, mas ninguém publicou nada "
"ainda."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -170,7 +169,7 @@ msgstr ""
"publicar algo."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -180,7 +179,7 @@ msgstr ""
"[publicar alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -190,67 +189,66 @@ msgstr ""
"atenção de %s ou publicar uma mensagem para sua atenção."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Você e amigos"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Atualizações de %1$s e amigos no %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "O método da API não foi encontrado!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Este método requer um POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-"Você pode especificar um parâmetro denominado 'device', com um dos valores: "
-"sms, im, none"
+"Você tem que especificar um parâmetro denominado 'device', com um desses "
+"valores: sms, im, none"
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Não foi possível atualizar o usuário."
@@ -270,7 +268,7 @@ msgstr "Não foi possível salvar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -329,43 +327,43 @@ msgstr "Mensagens diretas para %s"
msgid "All the direct messages sent to %s"
msgstr "Todas as mensagens diretas enviadas para %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Nenhuma mensagem de texto!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "O usuário destinatário não foi encontrado."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Não é possível enviar mensagens diretas para usuários que não sejam seus "
"amigos."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Não foi encontrado nenhum status com esse ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Esta mensagem já é favorita!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Não foi possível criar a favorita."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Essa mensagem não é favorita!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Não foi possível excluir a favorita."
@@ -398,122 +396,121 @@ msgstr "Não foi possível determinar o usuário de origem."
msgid "Could not find target user."
msgstr "Não foi possível encontrar usuário de destino."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"A identificação deve conter apenas letras minúsculas e números e não pode "
"ter e espaços."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Esta identificação já está em uso. Tente outro."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Não é uma identificação válida."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "A URL informada não é válida."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo muito extenso (máx. 255 caracteres)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Descrição muito extensa (máximo %d caracteres)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Localização muito extensa (máx. 255 caracteres)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Muitos apelidos! O máximo são %d."
-#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:267
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Apelido inválido: \"%s\""
+msgstr "Apelido inválido: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O apelido \"%s\" já está em uso. Tente outro."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "O apelido não pode ser igual à identificação."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
-msgstr "O grupo não foi encontrado!"
+msgstr "O grupo não foi encontrado."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Você já é membro desse grupo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "O administrador desse grupo bloqueou sua inscrição."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Você não é membro deste grupo."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Grupos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#: actions/apigrouplist.php:108
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Grupos dos quais %s é membro"
+msgstr "Grupos de %1$s nos quais %2$s é membro."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Grupos de %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "grupos no %s"
@@ -528,15 +525,15 @@ msgstr "Token inválido."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -606,12 +603,12 @@ msgstr ""
"confia."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +616,8 @@ msgid "Nickname"
msgstr "Usuário"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Senha"
@@ -636,11 +633,11 @@ msgstr "Permitir"
msgid "Allow or deny access to your account information."
msgstr "Permitir ou negar o acesso às informações da sua conta."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Esse método requer um POST ou DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Você não pode excluir uma mensagem de outro usuário."
@@ -657,25 +654,25 @@ msgstr "Você não pode repetir a sua própria mensagem."
msgid "Already repeated that notice."
msgstr "Você já repetiu essa mensagem."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "A mensagem foi excluída."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Não foi encontrada nenhuma mensagem com esse ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Está muito extenso. O tamanho máximo é de %s caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Não encontrado."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "O tamanho máximo da mensagem é de %s caracteres"
@@ -684,32 +681,32 @@ msgstr "O tamanho máximo da mensagem é de %s caracteres"
msgid "Unsupported format."
msgstr "Formato não suportado."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s marcadas como favoritas por %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Mensagens mencionando %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Mensagens públicas de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s mensagens de todo mundo!"
@@ -724,12 +721,12 @@ msgstr "Repetida para %s"
msgid "Repeats of %s"
msgstr "Repetições de %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Mensagens etiquetadas como %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mensagens etiquetadas como %1$s no %2$s!"
@@ -787,7 +784,7 @@ msgid "Preview"
msgstr "Visualização"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Excluir"
@@ -827,11 +824,11 @@ msgstr "O avatar foi excluído."
msgid "You already blocked that user."
msgstr "Você já bloqueou esse usuário."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuário"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -847,17 +844,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este usuário"
@@ -866,20 +862,19 @@ msgstr "Não bloquear este usuário"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuário"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
@@ -925,9 +920,9 @@ msgstr "Desbloquear este usuário"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Enviar para "
+msgstr "Publicar em %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -943,9 +938,9 @@ msgstr "Esse não é o seu código de confirmação!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Tipo de endereço desconhecido %s"
+msgstr "Tipo de endereço %s não reconhecido."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1006,7 +1001,7 @@ msgstr "Você não é o dono desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1040,7 +1035,7 @@ msgstr "Excluir esta aplicação"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Você não está autenticado."
@@ -1071,7 +1066,7 @@ msgid "Do not delete this notice"
msgstr "Não excluir esta mensagem."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -1111,45 +1106,55 @@ msgstr "Aparência"
msgid "Design settings for this StatusNet site."
msgstr "Configurações da aparência deste site StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "A URL da logo é inválida."
-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:322
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema não disponível: %s"
+msgstr "Tema não disponível: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Alterar a logo"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Logo do site"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Alterar o tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Tema do site"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema para o site."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Tema personalizado"
+
+#: actions/designadminpanel.php:471
+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
msgid "Change background image"
msgstr "Alterar imagem do fundo"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1159,57 +1164,65 @@ msgstr ""
"arquivo é de %1 $s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Ativado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Desativado"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Ativar/desativar a imagem de fundo."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Ladrilhar a imagem de fundo"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Alterar a cor"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Conteúdo"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Avançado"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "CSS personalizado"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar o padrão|"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaura a aparência padrão"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Restaura de volta ao padrão"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1219,7 +1232,7 @@ msgstr "Restaura de volta ao padrão"
msgid "Save"
msgstr "Salvar"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Salvar a aparência"
@@ -1372,7 +1385,6 @@ msgstr "Endereço de e-mail já confirmado."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
@@ -1391,7 +1403,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1406,7 +1417,6 @@ msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Adicionar"
@@ -1432,16 +1442,14 @@ msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferências"
+msgstr "Preferências de e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1484,9 +1492,8 @@ msgstr "Publique um MicroID para meu endereço de e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "As configurações da aparência foram salvas."
+msgstr "As configurações de e-mail foram salvas."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1499,7 +1506,7 @@ msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
@@ -1542,15 +1549,13 @@ msgstr "Nenhuma confirmação pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Isso é um endereço de MI errado."
+msgstr "Esse é o endereço de e-mail errado."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "A confirmação foi cancelada."
+msgstr "A confirmação por e-mail foi cancelada."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1560,9 +1565,8 @@ msgstr "Esse não é seu endereço de email."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "O endereço foi removido."
+msgstr "O endereço de e-mail foi removido."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1702,9 +1706,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Ocorreu um erro na atualização do perfil remoto"
+msgstr "Ocorreu um erro durante a atualização do perfil remoto."
#: actions/getfile.php:79
msgid "No such file."
@@ -1732,13 +1735,13 @@ msgstr "O usuário já possui este papel."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Não foi especificado nenhum perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Não foi encontrado nenhum perfil com esse ID."
@@ -1880,7 +1883,7 @@ msgstr "Torna este usuário um administrador"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Mensagens de %s"
@@ -2026,9 +2029,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferências"
+msgstr "Preferências do mensageiro instantâneo"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2100,15 +2102,13 @@ msgstr "Isso é um endereço de MI errado."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Não foi possível excluir a confirmação de e-mail."
+msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "A confirmação foi cancelada."
+msgstr "A confirmação do mensageiro instantâneo foi cancelada."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2118,9 +2118,8 @@ msgstr "Essa não é sua ID do Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "O endereço foi removido."
+msgstr "O endereço de mensageiro instantâneo foi removido."
#: actions/inbox.php:59
#, php-format
@@ -2143,10 +2142,10 @@ msgid "Invites have been disabled."
msgstr "Os convites foram desabilitados."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr ""
-"Você deve estar autenticado para convidar outros usuários para usar o %s"
+"Você deve estar autenticado para convidar outros usuários para usar o %s."
#: actions/invite.php:72
#, php-format
@@ -2312,42 +2311,42 @@ msgstr "Você não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Já está autenticado."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de usuário e/ou senha incorreto(s)."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erro na configuração do usuário. Você provavelmente não tem autorização."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
"computadores compartilhados!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu sua senha?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2355,14 +2354,16 @@ msgstr ""
"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
"senha antes de alterar suas configurações."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Autentique-se com seu nome de usuário e senha."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%"
-"%action.register%%) uma nova conta."
+"Ainda não possui um usuário? [Registre](%%action.register%%) uma nova conta."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2386,9 +2387,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Nenhuma mensagem atual"
+msgstr "Nenhuma mensagem atual."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2555,9 +2555,9 @@ msgid "You are not a user of that application."
msgstr "Você não é um usuário dessa aplicação."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Não foi possível revogar o acesso para a aplicação: "
+msgstr "Não foi possível revogar o acesso para a aplicação: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2569,31 +2569,30 @@ msgstr ""
"Os desenvolvedores podem editar as configurações de registro para suas "
"aplicações "
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "A mensagem não está associada a nenhum perfil"
+msgstr "A mensagem não está associada a nenhum perfil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Mensagem de %1$s no %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
-#, fuzzy, php-format
+#: actions/oembed.php:159
+#, php-format
msgid "Content type %s not supported."
-msgstr "tipo de conteúdo "
+msgstr "O tipo de conteúdo %s não é suportado."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Por favor, somente URLs %s sobre HTTP puro."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -2698,7 +2697,7 @@ msgid "6 or more characters"
msgstr "No mínimo 6 caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2710,11 +2709,11 @@ msgstr "Igual à senha acima"
msgid "Change"
msgstr "Alterar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "A senha deve ter, no mínimo, 6 caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "As senhas não coincidem."
@@ -2735,7 +2734,7 @@ msgid "Password saved."
msgstr "A senha foi salva."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Caminhos"
@@ -2744,24 +2743,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Configurações dos caminhos e do servidor para este site StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Sem permissão de leitura no diretório de temas: %s"
+msgstr "Sem permissão de leitura no diretório de temas: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Sem permissão de escrita no diretório de avatares: %s"
+msgstr "Sem permissão de escrita no diretório de avatares: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s"
+msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Sem permissão de leitura no diretório de locales: %s"
+msgstr "Sem permissão de leitura no diretório de locales: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2902,9 +2901,9 @@ msgid "People search"
msgstr "Procurar pessoas"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Não é uma etiqueta de pessoa válida: %s"
+msgstr "Não é uma etiqueta de pessoa válida: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2912,9 +2911,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "O conteúdo da mensagem é inválido"
+msgstr "O conteúdo da mensagem é inválido."
#: actions/postnotice.php:101
#, php-format
@@ -2941,43 +2939,43 @@ msgstr "Informações do perfil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL do seu site, blog ou perfil em outro site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descreva a si mesmo e os seus interesses em %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descreva a si mesmo e os seus interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Descrição"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localização"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
@@ -3020,7 +3018,7 @@ msgid ""
msgstr ""
"Assinar automaticamente à quem me assinar (melhor para perfis não humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "A descrição é muito extensa (máximo %d caracteres)."
@@ -3060,9 +3058,9 @@ msgid "Settings saved."
msgstr "As configurações foram salvas."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Além do limite da página (%s)"
+msgstr "Além do limite da página (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3284,7 +3282,7 @@ msgstr "A senha deve ter 6 ou mais caracteres."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
@@ -3294,40 +3292,39 @@ msgstr ""
"A nova senha foi salva com sucesso. A partir de agora você já está "
"autenticado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpe, mas somente convidados podem se registrar."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Desculpe, mas o código do convite é inválido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Não é permitido o registro."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Você não pode se registrar se não aceitar a licença."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "O endereço de e-mail já existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nome de usuário e/ou senha inválido(s)"
-#: actions/register.php:343
-#, fuzzy
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3335,43 +3332,68 @@ msgstr ""
"Através deste formulário você pode criar uma nova conta. A partir daí você "
"pode publicar mensagens e se conectar a amigos e colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "No mínimo 6 caracteres. Obrigatório."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, de preferência seu nome \"real\""
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Eu entendo que o conteúdo e os dados de %1$s são particulares e "
+"confidenciais."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Meus textos e arquivos estão licenciados sob a %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Todos os direitos reservados."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-" exceto estes dados particulares: senha, endereço de e-mail, endereço de MI "
+"Meus textos e arquivos estão disponíveis sob a %s, exceto estes dados "
+"particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
"e número de telefone."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3404,7 +3426,7 @@ msgstr ""
"\n"
"Obrigado por se registrar e esperamos que você aproveite o serviço."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3486,7 +3508,7 @@ msgstr "Você não pode repetir sua própria mensagem."
msgid "You already repeated that notice."
msgstr "Você já repetiu essa mensagem."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Repetida"
@@ -3561,7 +3583,7 @@ msgstr "Não é possível revogar os papéis dos usuários neste site."
msgid "User doesn't have this role."
msgstr "O usuário não possui este papel."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3575,7 +3597,7 @@ msgstr "O usuário já está em isolamento."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessões"
@@ -3618,7 +3640,7 @@ msgid "Icon"
msgstr "Ãcone"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Nome"
@@ -3629,7 +3651,7 @@ msgid "Organization"
msgstr "Organização"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Descrição"
@@ -3989,7 +4011,6 @@ msgid "Minimum text limit is 0 (unlimited)."
msgstr "O valor mínimo para o limite de texto é 0 (sem limites)."
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
msgstr "O limite de duplicatas deve ser de um ou mais segundos."
@@ -4082,7 +4103,6 @@ msgid "Unable to save site notice."
msgstr "Não foi possível salvar os avisos do site."
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
msgstr "O tamanho máximo para os avisos é de 255 caracteres."
@@ -4117,9 +4137,8 @@ msgstr "SMS não está disponível."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Endereço do MI"
+msgstr "Endereço de SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4143,7 +4162,6 @@ msgstr "Informe o código que você recebeu no seu telefone."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirmar"
@@ -4160,9 +4178,8 @@ msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferências"
+msgstr "Preferências do SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4175,9 +4192,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "As preferências foram salvas."
+msgstr "As preferências do SMS foram salvas."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4215,9 +4231,8 @@ msgstr "Isso é um número de confirmação errado."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "A confirmação foi cancelada."
+msgstr "A confirmação do SMS foi cancelada."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4227,9 +4242,8 @@ msgstr "Esse não é seu número de telefone."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Telefone para SMS"
+msgstr "O número de telefone para SMS foi removido."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4259,7 +4273,7 @@ msgstr "Não foi digitado nenhum código"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Estatísticas"
@@ -4280,9 +4294,8 @@ msgid "Invalid snapshot report URL."
msgstr "A URL para o envio das estatísticas é inválida."
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
-msgstr "Aleatoriamente durante o funcionamento"
+msgstr "Aleatoriamente durante as visitas ao site"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
@@ -4515,9 +4528,8 @@ msgid "User is not silenced."
msgstr "O usuário não está silenciado."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "Nenhuma ID de perfil na requisição."
+msgstr "A requisição não possui nenhuma ID de perfil."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4615,7 +4627,7 @@ msgstr ""
"as mensagens deste usuário. Se você não solicitou assinar as mensagens de "
"alguém, clique em \"Recusar\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licença"
@@ -4746,18 +4758,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Mensagens de %1$s no %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4766,11 +4778,11 @@ msgstr ""
"Este site funciona sobre %1$s versão %2$s, Copyright 2008-2010 StatusNet, "
"Inc. e colaboradores."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Colaboradores"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4782,7 +4794,7 @@ msgstr ""
"Software Foundation, na versão 3 desta licença ou (caso deseje) qualquer "
"versão posterior. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4794,7 +4806,7 @@ msgstr ""
"ADEQUAÇÃO A UMA FINALIDADE ESPECÃFICA. Verifique a GNU Affero General "
"Public License para mais detalhes. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4803,20 +4815,20 @@ msgstr ""
"Você deve ter recebido uma cópia da GNU Affero General Public License com "
"este programa. Caso contrário, veja %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Plugins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Versão"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Autor(es)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4825,12 +4837,12 @@ msgstr ""
"Nenhum arquivo pode ser maior que %d bytes e o arquivo que você enviou "
"possui %d bytes. Experimente enviar uma versão menor."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
@@ -4869,27 +4881,27 @@ msgid "Could not update message with new URI."
msgstr "Não foi possível atualizar a mensagem com a nova URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:182
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
"novamente daqui a alguns minutos."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4897,21 +4909,21 @@ msgstr ""
"Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e "
"publique novamente daqui a alguns minutos."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Você está proibido de publicar mensagens neste site."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5012,189 +5024,189 @@ msgid "Untitled page"
msgstr "Página sem título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Navegação primária no site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere seu e-mail, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conecte-se a outros serviços"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Altere as configurações do site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administrar"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Sair do site"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrar-se"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Autentique-se no site"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procure por pessoas ou textos"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Mensagem do site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Visualizações locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Notícia da página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Navegação secundária no site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "Termos de uso"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Mini-aplicativo"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Licença do software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5203,13 +5215,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é um serviço de microblog."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5221,56 +5233,56 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licença do conteúdo do site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
"reservados."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+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:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Anterior"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
@@ -5280,11 +5292,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr "Ainda não é possível manipular conteúdo remoto."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Ainda não é possível manipular conteúdo XML incorporado."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Ainda não é possível manipular conteúdo Base64."
@@ -5315,64 +5327,64 @@ msgid "Unable to delete design setting."
msgstr "Não foi possível excluir as configurações da aparência."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Configuração básica do site"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Configuração da aparência"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Aparência"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Configuração do usuário"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuário"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Configuração do acesso"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Configuração dos caminhos"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Configuração das sessões"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Editar os avisos do site"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Configurações das estatísticas"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Os recursos de API exigem acesso de leitura e escrita, mas você possui "
@@ -5462,25 +5474,22 @@ msgstr "Cancelar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Leitura e escrita"
+msgstr "leitura e escrita"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Somente leitura"
+msgstr "somente leitura"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprovado em %1$s - acesso \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Revogar"
@@ -5508,11 +5517,11 @@ msgstr "Mensagens onde este anexo aparece"
msgid "Tags for this attachment"
msgstr "Etiquetas para este anexo"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Não foi possível alterar a senha"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Não é permitido alterar a senha"
@@ -5594,9 +5603,9 @@ msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
+msgstr "Não foi possível remover o usuário %1$s do grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5606,14 +5615,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localização: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Site: %s"
@@ -5636,10 +5645,10 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -6150,8 +6159,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Se você acredita que esse usuário está se comportando de forma abusiva, você "
+"pode bloqueá-lo da sua lista de assinantes e reportá-lo como spammer ao "
+"administrador do site em %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6177,19 +6196,19 @@ msgstr ""
"Altere seu endereço de e-mail e suas opções de notificação em %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Descrição: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço de e-mail para publicar no %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6211,30 +6230,32 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Mensagem de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmação de SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
-#, fuzzy, php-format
+#: lib/mail.php:463
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Aguardando a confirmação deste número de telefone."
+msgstr ""
+"%s: confirme que você é o proprietário desse número de telefone com esse "
+"código:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Você teve a atenção chamada por %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6262,13 +6283,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem particular de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6302,13 +6323,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) marcou sua mensagem como favorita"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6346,21 +6367,24 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
"\n"
"\t%s"
msgstr ""
+"A conversa inteira pode ser lida aqui:\n"
+"\n"
+"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma mensagem citando você"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6386,6 +6410,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) acabou de enviar uma mensagem citando você (do tipo '@usuário') "
+"em %2$s.\n"
+"\n"
+"A mensagem está aqui:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Nela está escrito:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$s Pode respondê-la aqui:\n"
+"\n"
+"%6$s\n"
+"\n"
+"A lista de todas as citações a você está aqui:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Atenciosamente,\n"
+"%2$s\n"
+"\n"
+"P.S.: Você pode cancelar a notificações por e-mail aqui: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6400,7 +6447,7 @@ msgstr ""
"privadas para envolver outras pessoas em uma conversa. Você também pode "
"receber mensagens privadas."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "de"
@@ -6562,23 +6609,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "em"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Responder a esta mensagem"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Mensagem repetida"
@@ -6651,7 +6698,7 @@ msgstr "Suas mensagens enviadas"
msgid "Tags in %s's notices"
msgstr "Etiquetas nas mensagens de %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Desconhecido"
@@ -6688,7 +6735,7 @@ msgstr "Média diária"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6712,7 +6759,7 @@ msgstr "Em destaque"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sem argumentos return-to."
@@ -6733,7 +6780,7 @@ msgstr "Repetir esta mensagem"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoga o papel \"%s\" deste usuário"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nenhum usuário definido para o modo de usuário único."
@@ -6831,6 +6878,51 @@ msgstr "Nuvem de etiquetas pessoais definidas pelos outros usuário"
msgid "None"
msgstr "Nenhuma"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Erro no sistema durante o envio do arquivo."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Não foi possível atualizar o avatar."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Ocorreu um erro durante a atualização do perfil remoto."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Quem mais publica"
@@ -6911,56 +7003,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 87e7ea8fb..d276b197a 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:46+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:04:57+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -26,9 +26,9 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
-msgstr "ПринÑÑ‚ÑŒ"
+msgstr "ДоÑтуп"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
@@ -89,24 +89,24 @@ msgid "Save"
msgstr "Сохранить"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Ðет такой Ñтраницы."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -119,7 +119,7 @@ msgid "No such user."
msgstr "Ðет такого пользователÑ."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s и друзьÑ, Ñтраница %2$d"
@@ -127,39 +127,39 @@ msgstr "%1$s и друзьÑ, Ñтраница %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s и друзьÑ"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Лента друзей %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Лента друзей %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Лента друзей %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "Это лента %s и друзей, однако пока никто ничего не отправил."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -169,7 +169,7 @@ msgstr ""
"action.groups%%) или отправьте что-нибудь Ñами."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -179,7 +179,7 @@ msgstr ""
"что-нибудь Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -189,58 +189,58 @@ msgstr ""
"s или отправить запиÑÑŒ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Ð’Ñ‹ и друзьÑ"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Обновлено от %1$s и его друзей на %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Метод API не найден."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Этот метод требует POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -248,7 +248,7 @@ msgstr ""
"Ð’Ñ‹ должны указать параметр Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «device» и одним из значений: sms, im, "
"none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пользователÑ."
@@ -268,7 +268,7 @@ msgstr "Ðе удаётÑÑ Ñохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -327,43 +327,43 @@ msgstr "ПрÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s"
msgid "All the direct messages sent to %s"
msgstr "Ð’Ñе прÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñланные Ð´Ð»Ñ %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "ОтÑутÑтвует текÑÑ‚ ÑообщениÑ!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Слишком длинно. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ â€” %d знаков."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Получатель не найден."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Ðе удаётÑÑ Ð¿Ð¾Ñылать прÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñм, которые не ÑвлÑÑŽÑ‚ÑÑ "
"Вашими друзьÑми."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Ðет ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Этот ÑÑ‚Ð°Ñ‚ÑƒÑ ÑƒÐ¶Ðµ входит в чиÑло любимых."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Ðе удаётÑÑ Ñоздать любимую запиÑÑŒ."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Этот ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ входит в чиÑло ваших любимых."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ любимую запиÑÑŒ."
@@ -400,120 +400,120 @@ msgstr "Ðе удаётÑÑ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ иÑходного пользо
msgid "Could not find target user."
msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ целевого пользователÑ."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Ð˜Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ ÑоÑтоÑÑ‚ÑŒ только из пропиÑных букв и цифр и не иметь пробелов."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Такое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ. Попробуйте какое-нибудь другое."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ðеверное имÑ."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "URL Главной Ñтраницы неверен."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Полное Ð¸Ð¼Ñ Ñлишком длинное (не больше 255 знаков)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Слишком длинное опиÑание (макÑимум %d Ñимволов)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Слишком длинное меÑтораÑположение (макÑимум 255 знаков)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Слишком много алиаÑов! МакÑимальное чиÑло — %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ошибочный пÑевдоним: «%s»."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "ÐÐ»Ð¸Ð°Ñ Â«%s» уже иÑпользуетÑÑ. Попробуйте какой-нибудь другой."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "ÐÐ»Ð¸Ð°Ñ Ð½Ðµ может Ñовпадать Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Группа не найдена."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Ð’Ñ‹ заблокированы из Ñтой группы админиÑтратором."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s к группе %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "Группы %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Группы %1$s, в которых ÑоÑтоит %2$s."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Группы %s"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "группы на %s"
@@ -528,15 +528,15 @@ msgstr "Ðеправильный токен"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -602,12 +602,12 @@ msgstr ""
"Ñторонним приложениÑм, которым вы доверÑете."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "ÐаÑтройки"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -615,8 +615,8 @@ msgid "Nickname"
msgstr "ИмÑ"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -632,11 +632,11 @@ msgstr "Разрешить"
msgid "Allow or deny access to your account information."
msgstr "Разрешить или запретить доÑтуп к информации вашей учётной запиÑи."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Этот метод требует POST или DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Ð’Ñ‹ не можете удалÑÑ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей."
@@ -653,25 +653,25 @@ msgstr "Ðевозможно повторить ÑобÑтвенную запиÑ
msgid "Already repeated that notice."
msgstr "ЗапиÑÑŒ уже повторена."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÐ´Ð°Ð»Ñ‘Ð½."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° — %d знаков."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе найдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° запиÑи — %d Ñимволов, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ URL вложениÑ."
@@ -680,32 +680,32 @@ msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° запиÑи — %d Ñимволов
msgid "Unsupported format."
msgstr "Ðеподдерживаемый формат."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Любимое от %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %1$s, отмеченные как любимые %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / ОбновлениÑ, упоминающие %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s обновил Ñтот ответ на Ñообщение: %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %s от вÑех!"
@@ -720,12 +720,12 @@ msgstr "Повторено Ð´Ð»Ñ %s"
msgid "Repeats of %s"
msgstr "Повторы за %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "ЗапиÑи Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %1$s на %2$s!"
@@ -783,7 +783,7 @@ msgid "Preview"
msgstr "ПроÑмотр"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Удалить"
@@ -823,11 +823,11 @@ msgstr "Ðватара удалена."
msgid "You already blocked that user."
msgstr "Ð’Ñ‹ уже заблокировали Ñтого пользователÑ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Заблокировать пользователÑ."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -842,7 +842,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -851,7 +851,7 @@ msgstr "Ðет"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ðе блокировать Ñтого пользователÑ"
@@ -860,7 +860,7 @@ msgstr "Ðе блокировать Ñтого пользователÑ"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -868,11 +868,11 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователÑ."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ðе удаётÑÑ Ñохранить информацию о блокировании."
@@ -999,7 +999,7 @@ msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ владельцем Ñтого прилоÐ
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта."
@@ -1033,7 +1033,7 @@ msgstr "Удалить Ñто приложение"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ðе авторизован."
@@ -1064,7 +1064,7 @@ msgid "Do not delete this notice"
msgstr "Ðе удалÑÑ‚ÑŒ Ñту запиÑÑŒ"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Удалить Ñту запиÑÑŒ"
@@ -1104,45 +1104,53 @@ msgstr "Оформление"
msgid "Design settings for this StatusNet site."
msgstr "ÐаÑтройки Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñтого Ñайта StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Ðеверный URL логотипа."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Тема не доÑтупна: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Изменить логотип"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Логотип Ñайта"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Изменить тему"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Тема Ñайта"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Тема Ð´Ð»Ñ Ñайта."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "ОÑÐ¾Ð±Ð°Ñ Ñ‚ÐµÐ¼Ð°"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr "Ð’Ñ‹ можете загрузить оÑобую тему StatusNet в виде ZIP-архива."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Изменение фонового изображениÑ"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1152,57 +1160,65 @@ msgstr ""
"ÑоÑтавлÑет %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Включить"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Отключить"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Включить или отключить показ фонового изображениÑ."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "РаÑÑ‚Ñнуть фоновое изображение"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Изменение цветовой гаммы"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Содержание"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Ð‘Ð¾ÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "ТекÑÑ‚"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "СÑылки"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "РаÑширенный"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "ОÑобый CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "ИÑпользовать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "ВоÑÑтановить оформление по умолчанию"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ВоÑÑтановить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1212,7 +1228,7 @@ msgstr "ВоÑÑтановить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию"
msgid "Save"
msgstr "Сохранить"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Сохранить оформление"
@@ -1492,7 +1508,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðе удаётÑÑ Ñтандартизировать Ñтот Ñлектронный адреÑ"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ðеверный Ñлектронный адреÑ."
@@ -1720,13 +1736,13 @@ msgstr "Пользователь уже имеет Ñту роль."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Профиль не определен."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðет Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID."
@@ -1867,7 +1883,7 @@ msgstr "Сделать Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑтраÑ
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "Лента %s"
@@ -2295,39 +2311,39 @@ msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы."
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ð’Ñ‹ уже авторизовалиÑÑŒ."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Ðекорректное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка уÑтановки пользователÑ. Ð’Ñ‹, вероÑтно, не авторизованы."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "ÐвторизоватьÑÑ"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запомнить менÑ"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "ÐвтоматичеÑкии входить в дальнейшем. Ðе Ð´Ð»Ñ Ð¾Ð±Ñ‰ÐµÐ´Ð¾Ñтупных компьютеров!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "ПотерÑли или забыли пароль?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2335,14 +2351,17 @@ msgstr ""
"По причинам ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти введите Ð¸Ð¼Ñ Ð¸ пароль ещё раз, прежде чем "
"изменÑÑ‚ÑŒ Ваши уÑтановки."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Войти Ñ Ð²Ð°ÑˆÐ¸Ð¼ именем учаÑтника и паролем."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Вход Ñ Ð²Ð°ÑˆÐ¸Ð¼ логином и паролем. Ðет аккаунта? [ЗарегиÑтрируйте](%%action."
-"register%%) новый аккаунт."
+"У Ð²Ð°Ñ Ð½ÐµÑ‚ логина? [ЗарегиÑтрируйте](%%action.register%%) новую учётную "
+"запиÑÑŒ."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2542,30 +2561,30 @@ msgstr "Ð’Ñ‹ не разрешили приложениÑм иÑпользова
msgid "Developers can edit the registration settings for their applications "
msgstr "Разработчики могут изменÑÑ‚ÑŒ наÑтройки региÑтрации Ñвоих приложений "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Уведомление не имеет профилÑ."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ %1$s на %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Тип Ñодержимого %s не поддерживаетÑÑ."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Только %s URL в проÑтом HTTP, пожалуйÑта."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Ðеподдерживаемый формат данных."
@@ -2670,7 +2689,7 @@ msgid "6 or more characters"
msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Подтверждение"
@@ -2682,11 +2701,11 @@ msgstr "Тот же пароль, что и выше"
msgid "Change"
msgstr "Изменить"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Пароль должен быть длиной не менее 6 Ñимволов."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Пароли не Ñовпадают."
@@ -2707,7 +2726,7 @@ msgid "Password saved."
msgstr "Пароль Ñохранён."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Пути"
@@ -2761,7 +2780,7 @@ msgstr "Путь к Ñайту"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr "ПуÑÑ‚ÑŒ к локализациÑм"
+msgstr "Путь к локализациÑм"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
@@ -2910,43 +2929,43 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 латинÑких Ñтрочных буквы или цифры, без пробелов"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Полное имÑ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ГлавнаÑ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ÐÐ´Ñ€ÐµÑ Ñ‚Ð²Ð¾ÐµÐ¹ Ñтраницы, дневника или Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð½Ð° другом портале"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишите ÑÐµÐ±Ñ Ð¸ Ñвои ÑƒÐ²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ помощи %d Ñимволов"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишите ÑÐµÐ±Ñ Ð¸ Ñвои интереÑÑ‹"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "БиографиÑ"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "МеÑтораÑположение"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Где вы находитеÑÑŒ, например «Город, облаÑÑ‚ÑŒ, Ñтрана»"
@@ -2988,7 +3007,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "ÐвтоматичеÑки подпиÑыватьÑÑ Ð½Ð° вÑех, кто подпиÑалÑÑ Ð½Ð° менÑ"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð±Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ (макÑимум %d Ñимволов)."
@@ -3248,7 +3267,7 @@ msgstr "Пароль должен быть длиной не менее 6 Ñим
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не Ñовпадают."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Ошибка в уÑтановках пользователÑ."
@@ -3256,41 +3275,41 @@ msgstr "Ошибка в уÑтановках пользователÑ."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовый пароль уÑпешно Ñохранён. Ð’Ñ‹ авторизовалиÑÑŒ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "ПроÑтите, региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ по приглашению."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Извините, неверный приглаÑительный код."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÑпешна!"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "РегиÑтрациÑ"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтима."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Ð’Ñ‹ не можете зарегиÑтрироватьÑÑ, еÑли Ð’Ñ‹ не подтверждаете лицензионного "
"ÑоглашениÑ."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Такой Ñлектронный Ð°Ð´Ñ€ÐµÑ ÑƒÐ¶Ðµ задейÑтвован."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3299,34 +3318,58 @@ msgstr ""
"получите возможноÑÑ‚ÑŒ публиковать короткие ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ уÑтанавливать ÑвÑзи Ñ "
"друзьÑми и коллегами. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 латинÑких Ñтрочных букв или цифр, без пробелов. ОбÑзательное поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 или более Ñимволов. ОбÑзательное поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Тот же пароль что и Ñверху. ОбÑзательное поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Ðужна только Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹, оÑведомлений и воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Полное имÑ, предпочтительно Ваше наÑтоÑщее имÑ"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Я понимаю, что Ñодержание и данные %1$s ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтными и "
+"конфиденциальными."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "ÐвторÑким правом на мои текÑÑ‚Ñ‹ и файлы обладает %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "ÐвторÑкие права на мои текÑÑ‚Ñ‹ и файлы оÑтаютÑÑ Ð·Ð° мной."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Ð’Ñе права защищены."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3335,7 +3378,7 @@ msgstr ""
"Мои текÑÑ‚Ñ‹ и файлы доÑтупны на уÑловиÑÑ… %s, за иÑключением Ñледующей личной "
"информации: паролÑ, почтового адреÑа, номера меÑÑенджера и номера телефона."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3369,7 +3412,7 @@ msgstr ""
"СпаÑибо за то, что приÑоединилиÑÑŒ к нам, надеемÑÑ, что вы получите "
"удовольÑтвие от иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑервиÑа!"
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3448,7 +3491,7 @@ msgstr "Ð’Ñ‹ не можете повторить ÑобÑтвенную запÐ
msgid "You already repeated that notice."
msgstr "Ð’Ñ‹ уже повторили Ñту запиÑÑŒ."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Повторено"
@@ -3522,7 +3565,7 @@ msgstr "Ð’Ñ‹ не можете Ñнимать роли пользователеÐ
msgid "User doesn't have this role."
msgstr "Пользователь не имеет Ñтой роли."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3537,7 +3580,7 @@ msgstr "Пользователь уже в режиме пеÑочницы."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "СеÑÑии"
@@ -3580,7 +3623,7 @@ msgid "Icon"
msgstr "Иконка"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "ИмÑ"
@@ -3591,7 +3634,7 @@ msgid "Organization"
msgstr "ОрганизациÑ"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "ОпиÑание"
@@ -3705,7 +3748,7 @@ msgstr ""
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr "Это ÑпоÑоб разделить то, что вам нравитÑÑ."
+msgstr "Это ÑпоÑоб поделитьÑÑ Ñ‚ÐµÐ¼, что вам нравитÑÑ."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -4217,7 +4260,7 @@ msgstr "Код не введён"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Снимки"
@@ -4497,7 +4540,7 @@ msgstr "Пользователь"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr "ПользовательÑкие наÑтройки Ð´Ð»Ñ Ñтого Ñайта StatusNet."
+msgstr "ÐаÑтройки Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ñтого Ñайта StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
@@ -4573,7 +4616,7 @@ msgstr ""
"подпиÑатьÑÑ Ð½Ð° запиÑи Ñтого пользователÑ. ЕÑли Ð’Ñ‹ Ñтого не хотите делать, "
"нажмите «Отказ»."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "ЛицензиÑ"
@@ -4584,7 +4627,7 @@ msgstr "ПринÑÑ‚ÑŒ"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "ПодпиÑатьÑÑ Ð½Ð° %s"
+msgstr "ПодпиÑатьÑÑ Ð½Ð° Ñтого пользователÑ"
#: actions/userauthorization.php:219
msgid "Reject"
@@ -4701,18 +4744,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Обновлено от %1$s на %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4721,11 +4764,11 @@ msgstr ""
"Этот Ñайт Ñоздан на оÑнове %1$s верÑии %2$s, Copyright 2008-2010 StatusNet, "
"Inc. и учаÑтники."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Разработчики"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4737,7 +4780,7 @@ msgstr ""
"License, опубликованной Free Software Foundation, либо под верÑией 3, либо "
"(на выбор) под любой более поздней верÑией. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4749,7 +4792,7 @@ msgstr ""
"или ПРИГОДÐОСТИ ДЛЯ ЧÐСТÐОГО ИСПОЛЬЗОВÐÐИЯ. См. GNU Affero General Public "
"License Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ подробной информации. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4758,20 +4801,20 @@ msgstr ""
"Ð’Ñ‹ должны были получить копию GNU Affero General Public License вмеÑте Ñ "
"Ñтой программой. ЕÑли нет, Ñм. %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Плагины"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "ВерÑиÑ"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Ðвтор(Ñ‹)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4780,12 +4823,12 @@ msgstr ""
"Файл не может быть больше %d байт, тогда как отправленный вами файл Ñодержал "
"%d байт. Попробуйте загрузить меньшую верÑию."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Файл такого размера превыÑит вашу пользовательÑкую квоту в %d байта."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Файл такого размера превыÑит вашу меÑÑчную квоту в %d байта."
@@ -4824,27 +4867,27 @@ msgid "Could not update message with new URI."
msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñообщение Ñ Ð½Ð¾Ð²Ñ‹Ð¼ URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Ошибка баз данных при вÑтавке хеш-тегов: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Проблемы Ñ Ñохранением запиÑи. Слишком длинно."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при Ñохранении запиÑи. ÐеизвеÑтный пользователь."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Слишком много запиÑей за Ñтоль короткий Ñрок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4852,21 +4895,21 @@ msgstr ""
"Слишком много одинаковых запиÑей за Ñтоль короткий Ñрок; передохните немного "
"и попробуйте вновь через пару минут."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поÑтитьÑÑ Ð½Ð° Ñтом Ñайте (бан)"
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Проблемы Ñ Ñохранением запиÑи."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4967,188 +5010,188 @@ msgid "Untitled page"
msgstr "Страница без названиÑ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Личное"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватар, пароль, профиль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Соединить Ñ ÑервиÑами"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Соединить"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Изменить конфигурацию Ñайта"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "ÐаÑтройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ПриглаÑите друзей и коллег Ñтать такими же как Ð’Ñ‹ учаÑтниками %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "ПриглаÑить"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Выйти"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Выход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создать новый аккаунт"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтрациÑ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Помощь"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ИÑкать людей или текÑÑ‚"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "ПоиÑк"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
-msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "Уведомление Ñайта"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Локальные виды"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "ÐÐ°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ Ð¿Ð¾ подпиÑкам"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Помощь"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "О проекте"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "ЧаВо"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "ПользовательÑкое Ñоглашение"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "ИÑходный код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Бедж"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet лицензиÑ"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5158,13 +5201,13 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** — ÑÐµÑ€Ð²Ð¸Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5177,57 +5220,57 @@ msgstr ""
"licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ñодержимого Ñайта"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содержание и данные %1$s ÑвлÑÑŽÑ‚ÑÑ Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ и конфиденциальными."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"ÐвторÑкие права на Ñодержание и данные принадлежат %1$s. Ð’Ñе права защищены."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвторÑкие права на Ñодержание и данные принадлежат разработчикам. Ð’Ñе права "
"защищены."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Ð’Ñе материалы и данные %1$s доÑтупны на уÑловиÑÑ… лицензии %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Туда"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "ОжидалÑÑ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñлемент потока, а получен XML-документ целиком."
@@ -5235,11 +5278,11 @@ msgstr "ОжидалÑÑ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ Ñлемент потока, а пол
msgid "Can't handle remote content yet."
msgstr "Пока ещё Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ удалённое Ñодержимое."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Пока ещё Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ вÑтроенный XML."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Пока ещё Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ вÑтроенное Ñодержание Base64."
@@ -5270,64 +5313,64 @@ msgid "Unable to delete design setting."
msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ наÑтройки оформлениÑ."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "ОÑÐ½Ð¾Ð²Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñайта"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Сайт"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Оформление"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Пользователь"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð¾Ñтупа"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑеÑÑий"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Изменить уведомление Ñайта"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñнимков"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API реÑурÑа требует доÑтуп Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запиÑи, но у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ только доÑтуп "
@@ -5460,11 +5503,11 @@ msgstr "Сообщает, где поÑвлÑетÑÑ Ñто вложение"
msgid "Tags for this attachment"
msgstr "Теги Ð´Ð»Ñ Ñтого вложениÑ"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Изменение Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ удалоÑÑŒ"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ разрешена"
@@ -5546,9 +5589,9 @@ msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s."
+msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5558,14 +5601,14 @@ msgstr "Полное имÑ: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "МеÑтораÑположение: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "ДомашнÑÑ Ñтраница: %s"
@@ -6103,8 +6146,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s теперь Ñледит за вашими запиÑÑми на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"ЕÑли вы Ñчитаете, Ñта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ иÑпользуетÑÑ Ñо злоупотреблениÑми, вы "
+"можете заблокировать её включение в Ñвой ÑпиÑок подпиÑчиков и Ñообщить о "
+"Ñпаме админиÑтраторам Ñайта по %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6130,19 +6183,19 @@ msgstr ""
"Измените email-Ð°Ð´Ñ€ÐµÑ Ð¸ наÑтройки уведомлений на %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "БиографиÑ: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðовый Ñлектронный Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ñтинга %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6164,30 +6217,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ÑтатуÑ"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Подтверждение СМС"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s. Подтвердите, что Ñто ваш телефон, Ñледующим кодом:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Ð’Ð°Ñ Â«Ð¿Ð¾Ð´Ñ‚Ð¾Ð»ÐºÐ½ÑƒÐ»Â» пользователь %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6215,13 +6268,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ðовое приватное Ñообщение от %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6255,13 +6308,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) добавил вашу запиÑÑŒ в чиÑло Ñвоих любимых"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6299,7 +6352,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6310,13 +6363,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) отправил запиÑÑŒ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ вниманиÑ"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6378,7 +6431,7 @@ msgstr ""
"Ð²Ð¾Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей в разговор. СообщениÑ, получаемые от других "
"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "от "
@@ -6537,23 +6590,23 @@ msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
msgid "at"
msgstr "на"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "в контекÑте"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Ответить на Ñту запиÑÑŒ"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Ответить"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "ЗапиÑÑŒ повторена"
@@ -6626,7 +6679,7 @@ msgstr "Ваши иÑходÑщие ÑообщениÑ"
msgid "Tags in %s's notices"
msgstr "Теги запиÑей Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "ÐеизвеÑтно"
@@ -6663,7 +6716,7 @@ msgstr "СреднеÑуточнаÑ"
msgid "All groups"
msgstr "Ð’Ñе группы"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ðереализованный метод."
@@ -6687,7 +6740,7 @@ msgstr "ОÑобые"
msgid "Popular"
msgstr "ПопулÑрное"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Ðет аргумента return-to."
@@ -6708,7 +6761,7 @@ msgstr "Повторить Ñту запиÑÑŒ"
msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ€Ð¾Ð»ÑŒ «%s»"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ðи задан пользователь Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого режима."
@@ -6806,6 +6859,52 @@ msgstr "Облако тегов людей"
msgid "None"
msgstr "Ðет тегов"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr "Этот Ñервер не может обработать загруженные темы без поддержки ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Ошибка при загрузке файла темы."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Ошибка при Ñохранении темы."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "ÐžÑˆÐ¸Ð±Ð¾Ñ‡Ð½Ð°Ñ Ñ‚ÐµÐ¼Ð°. ÐŸÐ»Ð¾Ñ…Ð°Ñ Ñтруктура директорий."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Размер загруженной темы Ñлишком велик, в раÑпакованном виде она должна "
+"занимать не более %d байт."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "ÐедопуÑтимый архив: темы. ОтÑутÑтвует файл css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Тема Ñодержит недопуÑтимое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° или папки. ДопуÑтимы буквы ASCII, "
+"цифры, подчеркивание и знак минуÑа."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "Тема Ñодержит файл недопуÑтимого типа «.%s»."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð° темы."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Самые активные"
@@ -6886,56 +6985,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "пару Ñекунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "около чаÑа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "около %d чаÑа(ов) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "около меÑÑца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑца(ев) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 12fa2d986..c81149288 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
+"POT-Creation-Date: 2010-06-21 18:15+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr ""
@@ -81,24 +81,24 @@ msgid "Save"
msgstr ""
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr ""
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -111,7 +111,7 @@ msgid "No such user."
msgstr ""
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr ""
@@ -119,39 +119,39 @@ msgstr ""
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -159,14 +159,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -174,64 +174,64 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr ""
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr ""
@@ -251,7 +251,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -308,41 +308,41 @@ msgstr ""
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr ""
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
@@ -375,119 +375,119 @@ msgstr ""
msgid "Could not find target user."
msgstr ""
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr ""
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr ""
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr ""
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr ""
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr ""
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr ""
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr ""
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr ""
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr ""
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr ""
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr ""
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr ""
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr ""
@@ -502,15 +502,15 @@ msgstr ""
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -571,12 +571,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr ""
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -584,8 +584,8 @@ msgid "Nickname"
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr ""
@@ -601,11 +601,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -622,25 +622,25 @@ msgstr ""
msgid "Already repeated that notice."
msgstr ""
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr ""
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr ""
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -649,32 +649,32 @@ msgstr ""
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr ""
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -689,12 +689,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -751,7 +751,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr ""
@@ -791,11 +791,11 @@ msgstr ""
msgid "You already blocked that user."
msgstr ""
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr ""
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -807,7 +807,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -816,7 +816,7 @@ msgstr ""
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr ""
@@ -825,7 +825,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -833,11 +833,11 @@ msgid "Yes"
msgstr ""
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -964,7 +964,7 @@ msgstr ""
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -995,7 +995,7 @@ msgstr ""
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr ""
@@ -1024,7 +1024,7 @@ msgid "Do not delete this notice"
msgstr ""
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1062,45 +1062,53 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr ""
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr ""
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr ""
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr ""
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr ""
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1108,57 +1116,65 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1168,7 +1184,7 @@ msgstr ""
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1436,7 +1452,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1655,13 +1671,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1795,7 +1811,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr ""
@@ -2167,49 +2183,52 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr ""
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr ""
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr ""
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr ""
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr ""
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2401,30 +2420,30 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr ""
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr ""
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr ""
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2527,7 +2546,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr ""
@@ -2539,11 +2558,11 @@ msgstr ""
msgid "Change"
msgstr ""
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr ""
@@ -2564,7 +2583,7 @@ msgid "Password saved."
msgstr ""
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2763,43 +2782,43 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr ""
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr ""
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr ""
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr ""
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2839,7 +2858,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3083,7 +3102,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3091,78 +3110,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr ""
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr ""
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr ""
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3181,7 +3222,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3256,7 +3297,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr ""
@@ -3324,7 +3365,7 @@ msgstr ""
msgid "User doesn't have this role."
msgstr ""
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr ""
@@ -3338,7 +3379,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3381,7 +3422,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr ""
@@ -3392,7 +3433,7 @@ msgid "Organization"
msgstr ""
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr ""
@@ -3970,7 +4011,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4304,7 +4345,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4425,29 +4466,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr ""
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4455,7 +4496,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4463,39 +4504,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr ""
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4534,45 +4575,45 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4673,188 +4714,188 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr ""
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr ""
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr ""
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4862,13 +4903,13 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4877,54 +4918,54 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr ""
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -4932,11 +4973,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -4967,64 +5008,64 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr ""
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5154,11 +5195,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr ""
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr ""
@@ -5249,14 +5290,14 @@ msgstr ""
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5732,8 +5773,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5749,19 +5797,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr ""
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5775,30 +5823,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5815,13 +5863,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5841,13 +5889,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5869,7 +5917,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5877,13 +5925,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5920,7 +5968,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr ""
@@ -6074,23 +6122,23 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr ""
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr ""
@@ -6163,7 +6211,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6200,7 +6248,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6224,7 +6272,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6245,7 +6293,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6343,6 +6391,48 @@ msgstr ""
msgid "None"
msgstr ""
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "The theme file is missing or the upload failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr ""
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr ""
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6423,56 +6513,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 1e6065dc5..5d8461ca0 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:49+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:03+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "Ã…tkomst"
@@ -85,24 +85,24 @@ msgid "Save"
msgstr "Spara"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Ingen sådan sida"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -115,7 +115,7 @@ msgid "No such user."
msgstr "Ingen sådan användare."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s och vänner, sida %2$d"
@@ -123,39 +123,39 @@ msgstr "%1$s och vänner, sida %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s och vänner"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Flöden för %ss vänner (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Flöden för %ss vänner (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Flöden för %ss vänner (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "Detta är tidslinjen för %s och vänner, men ingen har skrivit något än."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -165,7 +165,7 @@ msgstr ""
"%) eller skriv något själv."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -175,7 +175,7 @@ msgstr ""
"någonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?"
"status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,64 +185,64 @@ msgstr ""
"%s eller skriva en notis för hans eller hennes uppmärksamhet."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Du och vänner"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Uppdateringar från %1$s och vänner på %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metod hittades inte."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Denna metod kräver en POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Kunde inte uppdatera användare."
@@ -262,7 +262,7 @@ msgstr "Kunde inte spara profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -321,41 +321,41 @@ msgstr "Direktmeddelande till %s"
msgid "All the direct messages sent to %s"
msgstr "Alla direktmeddelanden skickade till %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "Ingen meddelandetext!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Mottagare hittades inte."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Ingen status hittad med det ID:t."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Denna status är redan en favorit."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Kunde inte skapa favorit."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Denna status är inte en favorit."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Kunde inte ta bort favoriten."
@@ -388,120 +388,120 @@ msgstr "Kunde inte fastställa användare hos källan."
msgid "Could not find target user."
msgstr "Kunde inte hitta målanvändare."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Smeknamnet används redan. Försök med ett annat."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Inte ett giltigt smeknamn."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Hemsida är inte en giltig webbadress."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Fullständigt namn är för långt (max 255 tecken)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "Beskrivning är för lång (max 140 tecken)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Beskrivning av plats är för lång (max 255 tecken)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "För många alias! Maximum %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ogiltigt alias: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" används redan. Försök med ett annat."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Alias kan inte vara samma som smeknamn."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Grupp hittades inte."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Du är redan en medlem i denna grupp."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Du har blivit blockerad från denna grupp av administratören."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Du är inte en medlem i denna grupp."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%ss grupper"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s grupper %2$s är en medlem i."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s grupper"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "grupper på %s"
@@ -516,15 +516,15 @@ msgstr "Ogiltig token."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -588,12 +588,12 @@ msgstr ""
"ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -601,8 +601,8 @@ msgid "Nickname"
msgstr "Smeknamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Lösenord"
@@ -618,11 +618,11 @@ msgstr "Tillåt"
msgid "Allow or deny access to your account information."
msgstr "Tillåt eller neka åtkomst till din kontoinformation."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Denna metod kräver en POST eller en DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Du kan inte ta bort en annan användares status."
@@ -639,25 +639,25 @@ msgstr "Kan inte upprepa din egen notis."
msgid "Already repeated that notice."
msgstr "Redan upprepat denna notis."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Status borttagen."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Ingen status med det ID:t hittades."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Hittades inte."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
@@ -666,32 +666,32 @@ msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
msgid "Unsupported format."
msgstr "Format som inte stödjs."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoriter från %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Uppdateringar som nämner %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publika tidslinje"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s uppdateringar från alla!"
@@ -706,12 +706,12 @@ msgstr "Upprepat till %s"
msgid "Repeats of %s"
msgstr "Upprepningar av %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Notiser taggade med %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Uppdateringar taggade med %1$s på %2$s!"
@@ -769,7 +769,7 @@ msgid "Preview"
msgstr "Förhandsgranska"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Ta bort"
@@ -809,11 +809,11 @@ msgstr "Avatar borttagen."
msgid "You already blocked that user."
msgstr "Du har redan blockerat denna användare."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blockera användare"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -828,7 +828,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -837,7 +837,7 @@ msgstr "Nej"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Blockera inte denna användare"
@@ -846,7 +846,7 @@ msgstr "Blockera inte denna användare"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -854,11 +854,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blockera denna användare"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Misslyckades att spara blockeringsinformation."
@@ -986,7 +986,7 @@ msgstr "Du är inte ägaren av denna applikation."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -1020,7 +1020,7 @@ msgstr "Ta bort denna applikation"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Inte inloggad."
@@ -1051,7 +1051,7 @@ msgid "Do not delete this notice"
msgstr "Ta inte bort denna notis"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Ta bort denna notis"
@@ -1091,45 +1091,54 @@ msgstr "Utseende"
msgid "Design settings for this StatusNet site."
msgstr "Utseendeinställningar för denna StatusNet-webbplats."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Ogiltig webbadress för logtyp."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Tema inte tillgängligt: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Byt logotyp"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Webbplatslogotyp"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Byt tema"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Webbplatstema"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Tema för webbplatsen."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Webbplatstema"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Ändra bakgrundsbild"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Bakgrund"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1139,57 +1148,65 @@ msgstr ""
"filstorleken är %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "PÃ¥"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Av"
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Sätt på eller stäng av bakgrundsbild."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Upprepa bakgrundsbild"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Byt färger"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "Innehåll"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidofält"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "Länkar"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Använd standardvärden"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Återställ standardutseende"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Återställ till standardvärde"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1199,7 +1216,7 @@ msgstr "Återställ till standardvärde"
msgid "Save"
msgstr "Spara"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Spara utseende"
@@ -1470,7 +1487,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den e-postadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
@@ -1698,13 +1715,13 @@ msgstr "Användaren har redan denna roll."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil angiven."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med det ID:t."
@@ -1844,7 +1861,7 @@ msgstr "Gör denna användare till administratör"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s tidslinje"
@@ -2271,39 +2288,39 @@ msgstr "Du är inte en medlem i den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s lämnade grupp %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Redan inloggad."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Felaktigt användarnamn eller lösenord."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Tappat bort eller glömt ditt lösenord?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2311,14 +2328,17 @@ msgstr ""
"Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
"igen innan du ändrar dina inställningar."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Logga in med ditt användarnamn och lösenord."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
-"[Registrera](%%action.register%%) ett nytt konto."
+"Har du inte ett användarnamn ännu? [Registrera](%%action.register%%) ett "
+"nytt konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2520,30 +2540,30 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
"Utvecklare kan redigera registreringsinställningarna för sina applikationer "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Notisen har ingen profil."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$ss status den %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Innehållstyp %s stödjs inte."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "Endast %s-webbadresser över vanlig HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -2646,7 +2666,7 @@ msgid "6 or more characters"
msgstr "Minst 6 tecken"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bekräfta"
@@ -2658,11 +2678,11 @@ msgstr "Samma som lösenordet ovan"
msgid "Change"
msgstr "Ändra"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Lösenorden matchar inte."
@@ -2683,7 +2703,7 @@ msgid "Password saved."
msgstr "Lösenord sparat."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "Sökvägar"
@@ -2887,43 +2907,43 @@ msgstr "Profilinformation"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullständigt namn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hemsida"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beskriv dig själv och dina intressen med högst 140 tecken"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beskriv dig själv och dina intressen"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografi"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plats"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Var du håller till, såsom \"Stad, Län, Land\""
@@ -2967,7 +2987,7 @@ msgstr ""
"Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
"människa) "
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max %d tecken)."
@@ -3229,7 +3249,7 @@ msgstr "Lösenordet måste vara minst 6 tecken."
msgid "Password and confirmation do not match."
msgstr "Lösenord och bekräftelse matchar inte."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
@@ -3237,39 +3257,39 @@ msgstr "Fel uppstog i användarens inställning"
msgid "New password successfully saved. You are now logged in."
msgstr "Nya lösenordet sparat. Du är nu inloggad."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Tyvärr, ogiltig inbjudningskod."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrering inte tillåten."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Du kan inte registrera dig om du inte godkänner licensen."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-postadressen finns redan."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ogiltigt användarnamn eller lösenord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3277,37 +3297,60 @@ msgstr ""
"Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
"och ansluta till vänner och kollegor. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
"i."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Minst 6 tecken. MÃ¥ste fyllas i."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-post"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Används endast för uppdateringar, tillkännagivanden och återskapande av "
"lösenord"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Upphovsrätten till min text och mina filer innehas av %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "Upphovsrätten till min text och mina filer är fortsatt min."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Alla rättigheter reserverade."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3316,7 +3359,7 @@ msgstr ""
"Mina texter och filer är tillgängliga under %s med undantag av den här "
"privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3349,7 +3392,7 @@ msgstr ""
"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
"denna tjänst."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3432,7 +3475,7 @@ msgstr "Du kan inte upprepa din egna notis."
msgid "You already repeated that notice."
msgstr "Du har redan upprepat denna notis."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Upprepad"
@@ -3506,7 +3549,7 @@ msgstr "Du kan inte återkalla användarroller på denna webbplats."
msgid "User doesn't have this role."
msgstr "Användare har inte denna roll."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3520,7 +3563,7 @@ msgstr "Användare är redan flyttad till sandlådan."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "Sessioner"
@@ -3563,7 +3606,7 @@ msgid "Icon"
msgstr "Ikon"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Namn"
@@ -3574,7 +3617,7 @@ msgid "Organization"
msgstr "Organisation"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Beskrivning"
@@ -4193,7 +4236,7 @@ msgstr "Ingen kod ifylld"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Ögonblicksbilder"
@@ -4549,7 +4592,7 @@ msgstr ""
"prenumerera på den här användarens notiser. Om du inte bett att prenumerera "
"på någons meddelanden, klicka på \"Avvisa\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Licens"
@@ -4678,18 +4721,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "Uppdateringar från %1$s på %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4698,11 +4741,11 @@ msgstr ""
"Denna webbplats drivs med %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. och medarbetare."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Medarbetare"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4714,7 +4757,7 @@ msgstr ""
"Foundation, antingen version 3 av licensen, eller (utifrån ditt val) någon "
"senare version. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4726,7 +4769,7 @@ msgstr ""
"LÄMPLIGHET FÖR ETT SÄRSKILT ÄNDAMÅL. Se GNU Affero General Public License "
"för mer information. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4735,20 +4778,20 @@ msgstr ""
"Du bör ha fått en kopia av GNU Affero General Public License tillsammans med "
"detta program. Om inte, se %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Insticksmoduler"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "Version"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Författare"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4757,12 +4800,12 @@ msgstr ""
"Inga filer får vara större än %d byte och filen du skickade var %d byte. "
"Prova att ladda upp en mindre version."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte."
@@ -4801,27 +4844,27 @@ msgid "Could not update message with new URI."
msgstr "Kunde inte uppdatera meddelande med ny URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Databasfel vid infogning av hashtag: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Problem vid sparande av notis. För långt."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Problem vid sparande av notis. Okänd användare."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"För många notiser för snabbt; ta en vilopaus och posta igen om ett par "
"minuter."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4829,21 +4872,21 @@ msgstr ""
"För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen "
"om ett par minuter."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Du är utestängd från att posta notiser på denna webbplats."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4944,188 +4987,188 @@ msgid "Untitled page"
msgstr "Namnlös sida"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "Personligt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ändra din e-post, avatar, lösenord, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Anslut till tjänster"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Anslut"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Administratör"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "Bjud in"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Logga ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skapa ett konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "Registrera"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Logga in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Hjälp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Sök"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Webbplatsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "Lokala vyer"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Sidnotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Hjälp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "Frågor & svar"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "Användarvillkor"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Sekretess"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Källa"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Emblem"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5135,13 +5178,13 @@ msgstr ""
"%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** är en mikrobloggtjänst."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5153,55 +5196,55 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Innehåll och data av %1$s är privat och konfidensiell."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Tidigare"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument."
@@ -5209,11 +5252,11 @@ msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument."
msgid "Can't handle remote content yet."
msgstr "Kan inte hantera fjärrinnehåll ännu."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Kan inte hantera inbäddat XML-innehåll ännu."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Kan inte hantera inbäddat Base64-innehåll ännu."
@@ -5244,64 +5287,64 @@ msgid "Unable to delete design setting."
msgstr "Kunde inte ta bort utseendeinställning."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "Grundläggande webbplatskonfiguration"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Webbplats"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "Konfiguration av utseende"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Utseende"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "Konfiguration av användare"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "Användare"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "Konfiguration av åtkomst"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "Konfiguration av sökvägar"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "Konfiguration av sessioner"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Redigera webbplatsnotis"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "Konfiguration av ögonblicksbilder"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet."
@@ -5433,11 +5476,11 @@ msgstr "Notiser där denna bilaga förekommer"
msgid "Tags for this attachment"
msgstr "Taggar för denna billaga"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Byte av lösenord misslyckades"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Byte av lösenord är inte tillåtet"
@@ -5519,9 +5562,9 @@ msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
+msgstr "Kunde inte ta bort användare %1$s från grupp %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5531,14 +5574,14 @@ msgstr "Fullständigt namn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Plats: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Hemsida: %s"
@@ -6069,8 +6112,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lyssnar nu på dina notiser på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6096,19 +6146,19 @@ msgstr ""
"Ändra din e-postadress eller notiferingsinställningar på %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadress för att skicka till %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6130,30 +6180,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bekräftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bekräfta detta telefonnummer med denna kod:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blivit knuffad av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6181,13 +6231,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nytt privat meddelande från %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6221,13 +6271,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) lade till din notis som en favorit"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6265,7 +6315,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6276,13 +6326,13 @@ msgstr ""
"\n"
"\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6344,7 +6394,7 @@ msgstr ""
"engagera andra användare i konversationen. Folk kan skicka meddelanden till "
"dig som bara du ser."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "från"
@@ -6504,23 +6554,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "på"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "i sammanhang"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Upprepad av"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "Svara på denna notis"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Notis upprepad"
@@ -6593,7 +6643,7 @@ msgstr "Dina skickade meddelanden"
msgid "Tags in %s's notices"
msgstr "Taggar i %ss notiser"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Okänd"
@@ -6630,7 +6680,7 @@ msgstr "Dagligt genomsnitt"
msgid "All groups"
msgstr "Alla grupper"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Inte implementerad metod."
@@ -6654,7 +6704,7 @@ msgstr "Profilerade"
msgid "Popular"
msgstr "Populärt"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Inga \"return-to\"-argument."
@@ -6675,7 +6725,7 @@ msgstr "Upprepa denna notis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Återkalla rollen \"%s\" från denna användare"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ingen enskild användare definierad för enanvändarläge."
@@ -6773,6 +6823,51 @@ msgstr "Taggmoln för person, såsom taggats"
msgid "None"
msgstr "Ingen"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Systemfel vid uppladdning av fil."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Misslyckades uppdatera avatar."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Fel vid uppdatering av fjärrprofil."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Toppostare"
@@ -6853,56 +6948,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "för nån minut sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "för en timma sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "för en dag sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "för en månad sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index b591d2fc0..c5d30c58a 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:52+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:08+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "à°…à°‚à°¦à±à°¬à°¾à°Ÿà±"
@@ -84,24 +84,24 @@ msgid "Save"
msgstr "à°­à°¦à±à°°à°ªà°°à°šà±"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -114,7 +114,7 @@ msgid "No such user."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s మరియౠమితà±à°°à±à°²à±, పేజీ %2$d"
@@ -122,39 +122,39 @@ msgstr "%1$s మరియౠమితà±à°°à±à°²à±, పేజీ %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s మరియౠమితà±à°°à±à°²à±"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడౠ(RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడౠ(RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడౠ(ఆటమà±)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -162,14 +162,14 @@ msgid ""
msgstr "ఇతరà±à°²à°•à°¿ చందా చేరండి, [à°à°¦à±ˆà°¨à°¾ à°—à±à°‚à°ªà±à°²à±‹ చేరండి](%%action.groups%%) లేదా మీరే à°à°¦à±ˆà°¨à°¾ à°µà±à°°à°¾à°¯à°‚à°¡à°¿."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -177,65 +177,65 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "మీరౠమరియౠమీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à±"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "%2$sలో %1$s మరియౠసà±à°¨à±‡à°¹à°¿à°¤à±à°² à°¨à±à°‚à°¡à°¿ తాజాకరణలà±!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
@@ -257,7 +257,7 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -315,41 +315,41 @@ msgstr "%s à°•à°¿ నేరౠసందేశాలà±"
msgid "All the direct messages sent to %s"
msgstr "%sà°•à°¿ పంపిన à°…à°¨à±à°¨à°¿ నేరౠసందేశాలà±"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "సందేశపౠపాఠà±à°¯à°‚ లేదà±!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à°  సందేశ పరిమాణం %d à°…à°•à±à°·à°°à°¾à°²à±."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "à°…à°‚à°¦à±à°•à±‹à°µà°¾à°²à±à°¸à°¿à°¨ వాడà±à°•à°°à°¿ కనబడలేదà±."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "మీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à± కాని వాడà±à°•à°°à±à°²à°•à°¿ నేరౠసందేశాలౠపంపించలేరà±."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
-msgstr ""
+msgstr "à°† IDతో ఠనోటీసూ కనబడలేదà±."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•à±‡ మీ ఇషà±à°Ÿà°¾à°‚శం."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "à°† నోటీసౠఇషà±à°Ÿà°¾à°‚శం కాదà±."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ తొలగించలేకపోయాం."
@@ -384,119 +384,119 @@ msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±
msgid "Could not find target user."
msgstr "లకà±à°·à±à°¯à°¿à°¤ వాడà±à°•à°°à°¿à°¨à°¿ à°•à°¨à±à°—ొనలేకపోయాం."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "పేరà±à°²à±‹ à°šà°¿à°¨à±à°¨à°¬à°¡à°¿ à°…à°•à±à°·à°°à°¾à°²à± మరియౠఅంకెలౠమాతà±à°°à°®à±‡ ఖాళీలౠలేకà±à°‚à°¡à°¾ ఉండాలి."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "à°† పేరà±à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ వాడà±à°¤à±à°¨à±à°¨à°¾à°°à±. మరోటి à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "సరైన పేరౠకాదà±."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "హోమౠపేజీ URL సరైనది కాదà±."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "పూరà±à°¤à°¿ పేరౠచాలా పెదà±à°¦à°—à°¾ ఉంది (à°—à°°à°¿à°·à±à° à°‚à°—à°¾ 255 à°…à°•à±à°·à°°à°¾à°²à±)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "వివరణ చాలా పెదà±à°¦à°—à°¾ ఉంది (%d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "à°ªà±à°°à°¾à°‚తం పేరౠమరీ పెదà±à°¦à°—à°¾ ఉంది (255 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "చాలా మారà±à°ªà±‡à°°à±à°²à±! %d à°—à°°à°¿à°·à±à° à°‚."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "తపà±à°ªà±à°¡à± మారà±à°ªà±‡à°°à±: \"%s\"."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "\"%s\" à°…à°¨à±à°¨ మారà±à°ªà±‡à°°à±à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ వాడà±à°¤à±à°¨à±à°¨à°¾à°°à±. మరొకటి à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "మారà±à°ªà±‡à°°à± పేరà±à°¤à±‹ సమానంగా ఉండకూడదà±."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "à°—à±à°‚పౠదొరకలేదà±."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à±."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± à°† à°—à±à°‚పౠనà±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "వాడà±à°•à°°à°¿ %1$sని %2$s à°—à±à°‚à°ªà±à°²à±‹ చేరà±à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "మీరౠఈ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "వాడà±à°•à°°à°¿ %1$sని %2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s యొకà±à°• à°—à±à°‚à°ªà±à°²à±"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%2$s సభà±à°¯à±à°²à±à°—à°¾ ఉనà±à°¨ %2$s à°—à±à°‚à°ªà±à°²à±."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s à°—à±à°‚à°ªà±à°²à±"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "%s పై à°—à±à°‚à°ªà±à°²à±"
@@ -512,15 +512,15 @@ msgstr "తపà±à°ªà±à°¡à± పరిమాణం."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -583,12 +583,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "ఖాతా"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -596,8 +596,8 @@ msgid "Nickname"
msgstr "పేరà±"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "సంకేతపదం"
@@ -613,11 +613,11 @@ msgstr "à°…à°¨à±à°®à°¤à°¿à°‚à°šà±"
msgid "Allow or deny access to your account information."
msgstr "మీ ఖాతా సమాచారానà±à°¨à°¿ సంపà±à°°à°¾à°ªà°¿à°‚చడానికి à°…à°¨à±à°®à°¤à°¿à°‚à°šà°‚à°¡à°¿ లేదా నిరాకరించండి."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "ఇతర వాడà±à°•à°°à±à°² à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ మీరౠతొలగించలేరà±."
@@ -634,25 +634,25 @@ msgstr "మీ నోటీసà±à°¨à°¿ మీరే à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿
msgid "Already repeated that notice."
msgstr "ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చారà±."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "à°† IDతో ఠనోటీసౠకనబడలేదà±."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "అది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à°  నోటీసౠపరిమాణం %d à°…à°•à±à°·à°°à°¾à°²à±."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "కనబడలేదà±."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "à°—à°°à°¿à°·à±à°  నోటీసౠపొడవౠ%d à°…à°•à±à°·à°°à°¾à°²à±, జోడింపౠURLని à°•à°²à±à°ªà±à°•à±à°¨à°¿."
@@ -661,32 +661,32 @@ msgstr "à°—à°°à°¿à°·à±à°  నోటీసౠపొడవౠ%d à°…à°•à±à°·à°°
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
+msgstr "%1$s / %2$sని పేరà±à°•à±Šà°¨à±à°¨ నోటీసà±à°²à±"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s బహిరంగ కాలరేఖ"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "అందరి à°¨à±à°‚à°¡à°¿ %s తాజాకరణలà±!"
@@ -701,15 +701,15 @@ msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
msgid "Repeats of %s"
msgstr "%s యొకà±à°• à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¾à°²à±"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
-#, fuzzy, php-format
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±"
+msgstr "%2$sలో %1$s అనే à°Ÿà±à°¯à°¾à°—à±à°¤à±‹ ఉనà±à°¨ నోటీసà±à°²à±!"
#: actions/attachment.php:73
msgid "No such attachment."
@@ -765,7 +765,7 @@ msgid "Preview"
msgstr "à°®à±à°¨à±à°œà±‚à°ªà±"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "తొలగించà±"
@@ -778,9 +778,8 @@ msgid "Crop"
msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "పాకà±à°·à°¿à°• à°Žà°—à±à°®à°¤à°¿."
+msgstr "ఠదసà±à°¤à±à°°à°®à±‚ à°Žà°•à±à°•à°¿à°‚పబడలేదà±."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -806,11 +805,11 @@ msgstr "అవతారానà±à°¨à°¿ తొలగించాం."
msgid "You already blocked that user."
msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించారà±."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -824,17 +823,16 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "కాదà±"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించకà±"
@@ -843,7 +841,7 @@ msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించకà±"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -851,11 +849,11 @@ msgid "Yes"
msgstr "à°…à°µà±à°¨à±"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "నిరోధపౠసమాచారానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో విఫలమయà±à°¯à°¾à°‚."
@@ -903,9 +901,9 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "%s పై à°—à±à°‚à°ªà±à°²à±"
+msgstr "%sà°•à°¿ టపాచెయà±à°¯à°¿"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -984,7 +982,7 @@ msgstr "మీరౠఈ ఉపకరణం యొకà±à°• యజమాని à
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1017,7 +1015,7 @@ msgstr "à°ˆ ఉపకరణానà±à°¨à°¿ తొలగించà±"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చలేదà±."
@@ -1046,7 +1044,7 @@ msgid "Do not delete this notice"
msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించకà±"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±"
@@ -1086,45 +1084,54 @@ msgstr "రూపà±à°°à±‡à°–à°²à±"
msgid "Design settings for this StatusNet site."
msgstr "à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటౠసైటà±à°•à°¿ రూపà±à°°à±‡à°–à°² అమరికలà±."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "à°šà°¿à°¹à±à°¨à°ªà± URL చెలà±à°²à°¦à±."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "అలంకారం à°…à°‚à°¦à±à°¬à°¾à°Ÿà±à°²à±‹ లేదà±: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "à°šà°¿à°¹à±à°¨à°¾à°¨à±à°¨à°¿ మారà±à°šà±"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "సైటౠచిహà±à°¨à°‚"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "అలంకారానà±à°¨à°¿ మారà±à°šà±"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "సైటౠఅలంకారం"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "సైటà±à°•à°¿ అలంకారం."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "సైటౠఅలంకారం"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "నేపథà±à°¯ à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మారà±à°šà±"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "నేపథà±à°¯à°‚"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1132,57 +1139,65 @@ msgid ""
msgstr "సైటà±à°•à°¿ మీరౠనేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ à°Žà°•à±à°•à°¿à°‚చవచà±à°šà±. à°—à°°à°¿à°·à±à°  ఫైలౠపరిమాణం %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "à°°à°‚à°—à±à°²à°¨à± మారà±à°šà±"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "విషయం"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "పకà±à°•à°ªà°Ÿà±à°Ÿà±€"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "పాఠà±à°¯à°‚"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "లంకెలà±"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "à°…à°ªà±à°°à°®à±‡à°¯à°¾à°²à°¨à°¿ ఉపయోగించà±"
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1192,7 +1207,7 @@ msgstr ""
msgid "Save"
msgstr "à°­à°¦à±à°°à°ªà°°à°šà±"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "రూపà±à°°à±‡à°–లని à°­à°¦à±à°°à°ªà°°à°šà±"
@@ -1272,9 +1287,8 @@ msgid "Callback URL is not valid."
msgstr ""
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
+msgstr "ఉపకరణానà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
#: actions/editgroup.php:56
#, php-format
@@ -1347,7 +1361,6 @@ msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ నిరà±à°§à°¾à°°à°¿à°¤ ఈమెయిలà
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "తొలగించà±"
@@ -1366,7 +1379,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
@@ -1381,7 +1393,6 @@ msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾, \"username@example.org\"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "చేరà±à°šà±"
@@ -1467,7 +1478,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±:"
@@ -1688,13 +1699,13 @@ msgstr "వాడà±à°•à°°à°¿à°•à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°ˆ పాతà±à°°
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1832,7 +1843,7 @@ msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరà±à°µà°¾à°¹à°•à±à°¨à±à°¨à°¿
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s కాలరేఖ"
@@ -1908,7 +1919,7 @@ msgstr ""
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± మాతà±à°°à°®à±‡ à°—à±à°‚పౠసభà±à°¯à±à°²à°ªà±ˆ నిరోధానà±à°¨à°¿ à°Žà°¤à±à°¤à°¿à°µà±‡à°¯à°—లరà±."
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
@@ -2043,9 +2054,8 @@ msgstr "ఈమెయిలౠనిరà±à°§à°¾à°°à°£à°¨à°¿ తొలగింà
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "నిరà±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°‚ది."
+msgstr "IM నిరà±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°‚ది."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2055,9 +2065,8 @@ msgstr "ఇది మీ Jabber ID కాదà±"
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "à°† à°šà°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ తొలగించాం."
+msgstr "à°† IM à°šà°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ తొలగించాం."
#: actions/inbox.php:59
#, php-format
@@ -2120,6 +2129,8 @@ msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr ""
+"ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మీ ఆహà±à°µà°¾à°¨à°¾à°¨à±à°¨à°¿ అంగీకరించి సైటà±à°²à±‹ నమోదైనపà±à°ªà±à°¡à± మీకౠతెలియజేసà±à°¤à°¾à°®à±. ఇకà±à°•à°¡à°¿ à°ªà±à°°à°œà°¨à°¿ "
+"పెంచà±à°¤à±à°¨à±à°¨à°‚à°¦à±à°•à± ధనà±à°¯à°µà°¾à°¦à°¾à°²à±!"
#: actions/invite.php:162
msgid ""
@@ -2185,6 +2196,29 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"%2$s (%3$s) లో వారితో చేరమని %1$s మిమà±à°®à°²à±à°¨à°¿ ఆహà±à°µà°¾à°¨à°¿à°‚చారà±.\n"
+"\n"
+"%2$s అనేది మీకౠతెలిసిన మరియౠమీకౠఆసకà±à°¤à°¿ ఉనà±à°¨ à°µà±à°¯à°•à±à°¤à±à°²à°¤à±‹ à°Žà°ªà±à°ªà°Ÿà°¿à°•à°ªà±à°ªà±à°¡à± పరిచయంలో ఉండేదà±à°•à± "
+"వీలà±à°•à°²à±à°ªà°¿à°‚చే à°’à°• సూకà±à°·à±à°®-à°¬à±à°²à°¾à°—ింగౠసేవ.\n"
+"\n"
+"మీరౠకూడా మీ à°—à±à°°à°¿à°‚à°šà°¿, మీ ఆలోచనల à°—à±à°°à°¿à°‚à°šà°¿ లేదా మీ జీవితం à°—à±à°°à°¿à°‚à°šà°¿à°¨ విశేషాలనౠమీకౠతెలిసిన వారితో "
+"పంచà±à°•à±‹à°µà°šà±à°šà±. అలానే ఇది మీలాంటి ఆసకà±à°¤à±à°²à± కలిగిన కొతà±à°¤ à°µà±à°¯à°•à±à°¤à±à°²à°¨à°¿ à°•à°²à±à°¸à±à°•à±à°¨à±‡à°‚à°¦à±à°•à± గొపà±à°ª à°ªà±à°°à°¦à±‡à°¶à°‚.\n"
+"\n"
+"%1$s à°…à°¨à±à°¨à°¾à°°à±:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%2$sలో %1$s యొకà±à°• à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ మీరౠఇకà±à°•à°¡ చూడవచà±à°šà±:\n"
+"\n"
+"%5$s\n"
+"\n"
+"మీరౠదీనà±à°¨à°¿ à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°¿ చూడాలనà±à°•à±à°‚టే, à°ˆ ఆహà±à°µà°¾à°¨à°¾à°¨à±à°¨à°¿ అంగీకరించడానికి à°ˆ à°•à±à°°à°¿à°‚à°¦ లంకెపై నొకà±à°•à°‚à°¡à°¿.\n"
+"\n"
+"%6$s\n"
+"\n"
+"కాదనà±à°•à±à°‚టే, à°ˆ సందేశానà±à°¨à°¿ పటà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°•à°‚à°¡à°¿. మీ ఓపిక మరియౠసమయానికి ధనà±à°¯à°µà°¾à°¦à°¾à°²à±.\n"
+"\n"
+"వినమà±à°°à°¤à°¤à±‹, %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
@@ -2217,53 +2251,54 @@ msgstr "మీరౠఆ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±
msgid "%1$s left group %2$s"
msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "ఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం తపà±à°ªà±."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "వాడà±à°•à°°à°¿à°¨à°¿ అమరà±à°šà°¡à°‚లో పొరపాటà±. బహà±à°¶à°¾ మీకౠఅధీకరణ లేకపోవచà±à°šà±."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ననà±à°¨à± à°—à±à°°à±à°¤à±à°‚à°šà±à°•à±‹"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిషà±à°¯à°¤à±à°¤à±à°²à±‹ ఆటోమెటిగà±à°—à°¾ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±; బయటి à°•à°‚à°ªà±à°¯à±‚à°°à±à°² కొరకౠకాదà±!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "మీ సంకేతపదం మరà±à°šà°¿à°ªà±‹à°¯à°¾à°°à°¾?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"à°­à°¦à±à°°à°¤à°¾ కారణాల దృషà±à°Ÿà±à°¯à°¾, అమరికలౠమారà±à°šà±‡ à°®à±à°‚దౠమీ వాడà±à°•à°°à°¿ పేరà±à°¨à°¿ మరియౠసంకేతపదానà±à°¨à°¿ మరోసారి ఇవà±à°µà°‚à°¡à°¿."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "మీ వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
-msgstr ""
-"మీ వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿. మీకౠఇంకా వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా? కొతà±à°¤ ఖాతాని [నమోదà±à°šà±‡à°¸à±à°•à±‹à°‚à°¡à°¿]"
-"(%%action.register%%)."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "మీకౠఇంకా వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా? కొతà±à°¤ ఖాతాని [నమోదà±à°šà±‡à°¸à±à°•à±‹à°‚à°¡à°¿](%%action.register%%)."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2331,7 +2366,7 @@ msgstr "విషయం లేదà±!"
#: actions/newmessage.php:158
msgid "No recipient specified."
-msgstr ""
+msgstr "ఎవరికి పంపించాలో పేరà±à°•à±Šà°¨à°²à±‡à°¦à±."
#: actions/newmessage.php:164 lib/command.php:484
msgid ""
@@ -2343,9 +2378,9 @@ msgid "Message sent"
msgstr "సందేశానà±à°¨à°¿ పంపించాం"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం"
+msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం."
#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
@@ -2384,6 +2419,7 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"[à°ˆ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) à°µà±à°°à°¾à°¸à±‡ మొదటివారౠమీరే à°…à°µà±à°µà°‚à°¡à°¿!"
#: actions/noticesearch.php:124
#, php-format
@@ -2432,7 +2468,7 @@ msgstr "మీరౠనమోదౠచేసివà±à°¨à±à°¨ ఉపకరణ
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "మీరౠఇంకా ఠఉపకరణానà±à°¨à±€ నమోదౠచేసà±à°•à±‹à°²à±‡à°¦à±."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
@@ -2440,7 +2476,7 @@ msgstr "సంధానిత ఉపకరణాలà±"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "మీ ఖాతాని à°ªà±à°°à°¾à°ªà°¿à°‚చడానికి మీరౠఈ à°•à±à°°à°¿à°‚ది ఉపకరణాలకి à°…à°¨à±à°®à°¤à°¿à°¨à°¿à°šà±à°šà°¾à°°à±."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2453,37 +2489,36 @@ msgstr ""
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "మీ ఖాతాని ఉపయోగించà±à°•à±‹à°¡à°¾à°¨à°¿à°•à°¿ మీరౠఠఉపకరణానà±à°¨à±€ అధీకరించలేదà±."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
+msgstr "నోటీసà±à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%2$sలో %1$s యొకà±à°• à°¸à±à°¥à°¿à°¤à°¿"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "విషయ రకం "
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2591,7 +2626,7 @@ msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "నిరà±à°¥à°¾à°°à°¿à°‚à°šà±"
@@ -2603,11 +2638,11 @@ msgstr "పై సంకేతపదం వలెనే"
msgid "Change"
msgstr "మారà±à°šà±"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "సంకేతపదం తపà±à°ªà°¨à°¿à°¸à°°à°¿à°—à°¾ 6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±à°‚డాలి."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "సంకేతపదాలౠసరిపోలలేదà±."
@@ -2628,7 +2663,7 @@ msgid "Password saved."
msgstr "సంకేతపదం à°­à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "à°¤à±à°°à±‹à°µà°²à±"
@@ -2838,43 +2873,43 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à± సమాచారం"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 à°šà°¿à°¨à±à°¨à°¬à°¡à°¿ à°…à°•à±à°·à°°à°¾à°²à± లేదా అంకెలà±, విరామచిహà±à°¨à°¾à°²à± మరియౠఖాళీలౠతపà±à°ª"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "పూరà±à°¤à°¿ పేరà±"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "హోమౠపేజీ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ %d à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ చెపà±à°ªà°‚à°¡à°¿"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "à°ªà±à°°à°¾à°‚తం"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "మీరౠఎకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, \"నగరం, రాషà±à°Ÿà±à°°à°‚ (లేదా à°ªà±à°°à°¾à°‚తం), దేశం\""
@@ -2914,7 +2949,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚ చాలా పెదà±à°¦à°—à°¾ ఉంది (%d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
@@ -3163,7 +3198,7 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే à°Žà°•à±à
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియౠనిరà±à°§à°¾à°°à°£ సరిపోలేదà±."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3171,78 +3206,102 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr "మీ కొతà±à°¤ సంకేతపదం à°­à°¦à±à°°à°®à±ˆà°‚ది. మీరౠఇపà±à°ªà±à°¡à± లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మాతà±à°°à°®à±‡ నమోదà±à°•à°¾à°—లరà±."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, తపà±à°ªà± ఆహà±à°µà°¾à°¨ సంకేతం."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "నమోదౠవిజయవంతం"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదà±"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "నమోదౠఅనà±à°®à°¤à°¿à°‚చబడదà±."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•à±‹à°²à±‡à°°à±."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఇపà±à°ªà°Ÿà°¿à°•à±‡ ఉంది."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం తపà±à°ªà±."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 à°šà°¿à°¨à±à°¨à°¬à°¡à°¿ à°…à°•à±à°·à°°à°¾à°²à± లేదా అంకెలà±, విరామ à°šà°¿à°¹à±à°¨à°¾à°²à± లేదా ఖాళీలౠలేకà±à°‚à°¡à°¾. తపà±à°ªà°¨à°¿à°¸à°°à°¿."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±. తపà±à°ªà°¨à°¿à°¸à°°à°¿."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తపà±à°ªà°¨à°¿à°¸à°°à°¿."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "ఈమెయిలà±"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "తాజా విశేషాలà±, à°ªà±à°°à°•à°Ÿà°¨à°²à±, మరియౠసంకేతపదం పోయినపà±à°ªà±à°¡à± మాతà±à°°à°®à±‡ ఉపయోగిసà±à°¤à°¾à°‚."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "పొడà±à°—ాటి పేరà±, మీ \"అసలà±\" పేరైతే మంచిది"
-#: actions/register.php:494
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
-msgstr " à°ˆ అంతరంగిక భోగటà±à°Ÿà°¾ తపà±à°ª: సంకేతపదం, ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾, IM à°šà°¿à°°à±à°¨à°¾à°®à°¾, మరియౠఫోనౠనంబరà±."
+msgstr ""
+"నా పాఠà±à°¯à°‚ మరియౠదసà±à°¤à±à°°à°¾à°²à± %s à°•à±à°°à°¿à°‚à°¦ లభà±à°¯à°‚, à°ˆ అంతరంగిక భోగటà±à°Ÿà°¾ తపà±à°ª: సంకేతపదం, ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾, IM "
+"à°šà°¿à°°à±à°¨à°¾à°®à°¾, మరియౠఫోనౠనంబరà±."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3273,7 +3332,7 @@ msgstr ""
"\n"
"నమోదà±à°šà±‡à°¸à±à°•à±à°¨à±à°¨à°‚à°¦à±à°•à± కృతజà±à°žà°¤à°²à± మరియౠఈ సేవని ఉపయోగిసà±à°¤à±‚ మీరౠఆనందిసà±à°¤à°¾à°°à°¨à°¿ మేం ఆశిసà±à°¤à±à°¨à±à°¨à°¾à°‚."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3294,7 +3353,7 @@ msgstr ""
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "à°¸à±à°¦à±‚à°° చందా"
#: actions/remotesubscribe.php:124
#, fuzzy
@@ -3307,7 +3366,7 @@ msgstr "వాడà±à°•à°°à°¿ పేరà±"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "మీరౠఅనà±à°¸à°°à°¿à°‚చాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨ వాడà±à°•à°°à°¿ యొకà±à°• à°®à±à°¦à±à°¦à±à°ªà±‡à°°à±"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
@@ -3332,7 +3391,7 @@ msgstr ""
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "అది à°¸à±à°¥à°¾à°¨à°¿à°• à°ªà±à°°à±Šà°«à±ˆà°²à±! చందాచేరడానికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
@@ -3355,7 +3414,7 @@ msgstr "మీ నోటీసà±à°¨à°¿ మీరే à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿
msgid "You already repeated that notice."
msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చారà±."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "సృషà±à°Ÿà°¿à°¤à°‚"
@@ -3392,11 +3451,11 @@ msgid "Replies feed for %s (Atom)"
msgstr "%s కొరకౠసà±à°ªà°‚దనల ఫీడౠ(ఆటమà±)"
#: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
-msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±."
+msgstr "ఇది %1$sà°•à°¿ వచà±à°šà°¿à°¨ à°¸à±à°ªà°‚దనలని చూపించే కాలరేఖ కానీ %2$s దృషà±à°Ÿà°¿à°•à°¿ ఇంకా ఎవరూ à°à°®à±€ పంపించలేదà±."
#: actions/replies.php:204
#, php-format
@@ -3425,11 +3484,10 @@ msgid "You cannot revoke user roles on this site."
msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!"
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
+msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ˆ పాతà±à°° లేదà±."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±"
@@ -3445,7 +3503,7 @@ msgstr "వాడà±à°•à°°à°¿à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°—à±à°‚à°ªà±à°¨à
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3476,9 +3534,8 @@ msgid "Save site settings"
msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "à°—à±à°‚à°ªà±à°¨à°¿ వదిలివెళà±à°³à°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+msgstr "ఉపకరణాలని చూడడానికి మీరౠతపà±à°ªà°¨à°¿à°¸à°°à°¿à°—à°¾ à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
#: actions/showapplication.php:157
msgid "Application profile"
@@ -3490,7 +3547,7 @@ msgid "Icon"
msgstr "à°ªà±à°°à°¤à±€à°•à°‚"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "పేరà±"
@@ -3501,7 +3558,7 @@ msgid "Organization"
msgstr "సంసà±à°§"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "వివరణ"
@@ -3514,7 +3571,7 @@ msgstr "గణాంకాలà±"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "సృషà±à°Ÿà°¿à°‚చినది %1$s - à°…à°ªà±à°°à°®à±‡à°¯ à°…à°‚à°¦à±à°¬à°¾à°Ÿà± %2$s - %3$d వాడà±à°•à°°à±à°²à±"
#: actions/showapplication.php:213
msgid "Application actions"
@@ -3575,9 +3632,9 @@ msgid "Feed for favorites of %s (RSS 1.0)"
msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడà±"
#: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడà±"
+msgstr "%s యొకà±à°• ఇషà±à°Ÿà°¾à°‚శాల ఫీడౠ(RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
@@ -3688,6 +3745,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** అనేది [à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±](http://status.net/) అనే à°¸à±à°µà±‡à°šà±à°›à°¾ ఉపకరణ అధారిత [సూకà±à°·à±à°®-à°¬à±à°²à°¾à°—à°¿à°‚à°—à±]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక "
+"వాడà±à°•à°°à°¿ à°—à±à°‚à°ªà±.\n"
+"దీని సభà±à°¯à±à°²à± వారి జీవితం మరియౠఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ à°šà°¿à°¨à±à°¨ సందేశాలని పంచà±à°•à±à°‚టారà±. à°ˆ à°—à±à°‚పౠమరియౠఇంకా "
+"చాల వాటిలో భాగసà±à°¤à±à°²à°µà±à°µà°¡à°¾à°¨à°¿à°•à°¿ [ఇపà±à°ªà±à°¡à±‡ చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
+"doc.help%%%%))"
#: actions/showgroup.php:469
#, php-format
@@ -3760,9 +3823,9 @@ msgid "FOAF for %s"
msgstr ""
#: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±."
+msgstr "ఇది %1$s యొకà±à°• కాలరేఖ కానీ %2$s ఇంకా à°à°®à±€ రాయలేదà±."
#: actions/showstream.php:205
msgid ""
@@ -3884,7 +3947,7 @@ msgstr "à°…à°ªà±à°°à°®à±‡à°¯ భాష"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
-msgstr ""
+msgstr "విహారిణి అమరికల à°¨à±à°‚à°¡à°¿ భాషని à°¸à±à°µà°¯à°‚చాలకంగా పొందలేకపోయినపà±à°ªà±à°¡à± ఉపయోగించే సైటౠభాష"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -3904,7 +3967,7 @@ msgstr ""
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
-msgstr ""
+msgstr "అదే విషయానà±à°¨à°¿ మళà±à°³à±€ టపా చేయడానికి వాడà±à°•à°°à±à°²à± à°Žà°‚à°¤ సమయం (à°•à±à°·à°£à°¾à°²à±à°²à±‹) వేచివà±à°‚డాలి."
#: actions/sitenoticeadminpanel.php:56
msgid "Site Notice"
@@ -3921,9 +3984,8 @@ msgid "Unable to save site notice."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "సైటà±-వారీ నోటీసà±à°•à°¿ à°—à°°à°¿à°·à±à°  పొడవౠ255 à°…à°•à±à°·à°°à°¾à°²à±"
+msgstr "సైటà±-వారీ నోటీసà±à°•à°¿ à°—à°°à°¿à°·à±à°  పొడవౠ255 à°…à°•à±à°·à°°à°¾à°²à±."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -3957,9 +4019,8 @@ msgstr "హోమౠపేజీ URL సరైనది కాదà±."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM à°šà°¿à°°à±à°¨à°¾à°®à°¾"
+msgstr "SMS à°šà°¿à°°à±à°¨à°¾à°®à°¾"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4092,7 +4153,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4213,6 +4274,8 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%sà°•à°¿ చందాదారà±à°²à± ఎవరూ లేరà±. [à°’à°• ఖాతాని నమోదౠచేసà±à°•à±à°¨à°¿](%%%%action.register%%%%) మీరౠ"
+"à°Žà°‚à°¦à±à°•à± మొదటి చందాదారౠకాకూడదà±?"
#: actions/subscriptions.php:52
#, php-format
@@ -4226,12 +4289,12 @@ msgstr "%1$s చందాలà±, పేజీ %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "మీరౠఈ à°µà±à°¯à°•à±à°¤à±à°² నోటీసà±à°²à°¨à°¿ వింటà±à°¨à±à°¨à°¾à°°à±."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "%s వీరి నోటీసà±à°²à°¨à°¿ వింటà±à°¨à±à°¨à°¾à°°à±."
#: actions/subscriptions.php:126
#, php-format
@@ -4372,7 +4435,7 @@ msgstr ""
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "చెలà±à°²à°¨à°¿ à°¸à±à°µà°¾à°—à°¤ పాఠà±à°¯à°‚. à°—à°°à°¿à°·à±à°  పొడవౠ255 à°…à°•à±à°·à°°à°¾à°²à±."
#: actions/useradminpanel.php:165
#, php-format
@@ -4437,7 +4500,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "లైసెనà±à°¸à±"
@@ -4558,29 +4621,29 @@ msgstr "[à°—à±à°‚à°ªà±à°²à°¨à°¿ వెతికి](%%action.groupsearch%%) à°
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4588,7 +4651,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4596,39 +4659,39 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
-msgstr ""
+msgstr "à°ªà±à°²à°—à°¿à°¨à±à°²à±"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "సంచిక"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "రచయిత(à°²à±)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4667,51 +4730,49 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "అవతారానà±à°¨à°¿ పెటà±à°Ÿà°¡à°‚లో పొరపాటà±"
-#: classes/Notice.php:245
-#, fuzzy
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
-msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
+msgstr "నోటీసà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±. చాలా పొడవà±à°—à°¾ ఉంది."
-#: classes/Notice.php:249
-#, fuzzy
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
-msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
+msgstr "నోటీసà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±. à°—à±à°°à±à°¤à±à°¤à±†à°²à°¿à°¯à°¨à°¿ వాడà±à°•à°°à°¿."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+msgstr "చాలా à°Žà°•à±à°•à±à°µ నోటీసà±à°²à± à°…à°‚à°¤ వేగంగా; కాసà±à°¤ ఊపిరి తీసà±à°•à±à°¨à°¿ మళà±à°³à±€ కొనà±à°¨à°¿ నిమిషాల తరà±à°µà°¾à°¤ à°µà±à°°à°¾à°¯à°‚à°¡à°¿."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "à°ˆ సైటà±à°²à±‹ నోటీసà±à°²à± రాయడం à°¨à±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిషేధించారà±."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
-#, fuzzy, php-format
+#: classes/Notice.php:1564
+#, php-format
msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
@@ -4815,207 +4876,205 @@ msgid "Untitled page"
msgstr "శీరà±à°·à°¿à°•à°²à±‡à°¨à°¿ పేజీ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
-msgstr ""
+msgstr "à°ªà±à°°à°¾à°§à°®à°¿à°• సైటౠమారà±à°—దరà±à°¶à°¿à°¨à°¿"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•à±‹à°‚à°¡à°¿"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "à°…à°¨à±à°¸à°‚ధానాలà±"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "à°…à°¨à±à°¸à°‚ధానించà±"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "సైటౠసà±à°µà°°à±‚పణానà±à°¨à°¿ మారà±à°šà°‚à°¡à°¿"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à±"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "à°ˆ ఫారానà±à°¨à°¿ ఉపయోగించి మీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à°¨à± మరియౠసహోదà±à°¯à±‹à°—à±à°²à°¨à± à°ˆ సేవనౠవినియోగించà±à°•à±‹à°®à°¨à°¿ ఆహà±à°µà°¾à°¨à°¿à°‚à°šà°‚à°¡à°¿."
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "ఆహà±à°µà°¾à°¨à°¿à°‚à°šà±"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "సైటౠనà±à°‚à°¡à°¿ నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "ఖాతాని సృషà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°‚à°¡à°¿"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "నమోదà±"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "సహాయం"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "à°ªà±à°°à°œà°²à± లేదా పాఠà±à°¯à°‚ కొరకౠవెతకండి"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "వెతà±à°•à±"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "సైటౠగమనిక"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• వీకà±à°·à°£à°²à±"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "పేజీ గమనిక"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
-#, fuzzy
+#: lib/action.php:762
msgid "Secondary site navigation"
-msgstr "చందాలà±"
+msgstr "à°¦à±à°µà°¿à°¤à±€à°¯ సైటౠమారà±à°—దరà±à°¶à°¿à°¨à°¿"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "సహాయం"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "à°—à±à°°à°¿à°‚à°šà°¿"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "à°ªà±à°°à°¶à±à°¨à°²à±"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "సేవా నియమాలà±"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "అంతరంగికత"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "మూలమà±"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "సంపà±à°°à°¦à°¿à°‚à°šà±"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "బాడà±à°œà°¿"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసెనà±à°¸à±"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
-#, fuzzy, php-format
+#: lib/action.php:827
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారౠ"
-"అందిసà±à°¤à±à°¨à±à°¨ మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚. "
+"అందిసà±à°¤à±à°¨à±à°¨ సూకà±à°·à±à°® à°¬à±à°²à°¾à°—ింగౠసేవ."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** అనేది మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5027,55 +5086,55 @@ msgstr ""
"పై నడà±à°¸à±à°¤à±à°‚ది."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "కొతà±à°¤ సందేశం"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "ఇంతకà±à°°à°¿à°¤à°‚"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5083,11 +5142,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5118,69 +5177,69 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "à°ªà±à°°à°¾à°¥à°®à°¿à°• సైటౠసà±à°µà°°à±‚పణం"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "సైటà±"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "రూపకలà±à°ªà°¨ à°¸à±à°µà°°à±‚పణం"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "రూపà±à°°à±‡à°–à°²à±"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "వాడà±à°•à°°à°¿ à°¸à±à°µà°°à±‚పణం"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "వాడà±à°•à°°à°¿"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "రూపకలà±à°ªà°¨ à°¸à±à°µà°°à±‚పణం"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "సైటౠగమనిక"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5269,13 +5328,11 @@ msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
msgstr "చదవడం-à°µà±à°°à°¾à°¯à°¡à°‚"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
msgstr "చదవడం-మాతà±à°°à°®à±‡"
@@ -5316,12 +5373,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "సంకేతపదం మారà±à°ªà±"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "సంకేతపదం మారà±à°ªà±"
@@ -5339,9 +5396,8 @@ msgid "Command failed"
msgstr "ఆదేశం విఫలమైంది"
#: lib/command.php:83 lib/command.php:105
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "à°† ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ లేదా వాడà±à°•à°°à°¿à°ªà±‡à°°à±à°¤à±‹ వాడà±à°•à°°à±à°²à±†à°µà°°à±‚ లేరà±."
+msgstr "à°† à°—à±à°°à±à°¤à°¿à°‚à°ªà±à°¤à±‹ ఠనోటీసౠలేదà±"
#: lib/command.php:99 lib/command.php:596
#, fuzzy
@@ -5390,7 +5446,7 @@ msgstr ""
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr ""
+msgstr "నోటీసà±à°¨à°¿ ఇషà±à°Ÿà°¾à°‚శంగా à°—à±à°°à±à°¤à°¿à°‚చాం."
#: lib/command.php:323
msgid "You are already a member of that group"
@@ -5406,9 +5462,9 @@ msgstr "వాడà±à°•à°°à°¿ %1$sని %2$s à°—à±à°‚à°ªà±à°²à±‹ చేరà±
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "వాడà±à°•à°°à°¿ %1$sని %2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం."
+msgstr "వాడà±à°•à°°à°¿ %1$sని %2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5418,14 +5474,14 @@ msgstr "పూరà±à°¤à°¿à°ªà±‡à°°à±: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "à°ªà±à°°à°¾à°‚తం: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "హోంపేజీ: %s"
@@ -5446,9 +5502,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %1$d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%2$d పంపించారà±."
+msgstr "సందేశం చాలా పొడవà±à°—à°¾ ఉంది - %1$d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%2$d పంపించారà±"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5623,13 +5679,12 @@ msgid ""
msgstr ""
#: lib/common.php:135
-#, fuzzy
msgid "No configuration file found. "
-msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం లేదà±."
+msgstr "à°¸à±à°µà°°à±‚పణపౠదసà±à°¤à±à°°à°®à±‡à°®à±€ కనబడలేదà±. "
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "à°¸à±à°µà°°à±‚పణపౠదసà±à°¤à±à°°à°¾à°² కొరకౠఈ à°ªà±à°°à°¦à±‡à°¶à°¾à°²à°¤à±‹ చూసాం: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
@@ -5687,7 +5742,7 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±."
#: lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "ఇషà±à°Ÿà°ªà°¡à±"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -5744,9 +5799,8 @@ msgid "URL of the homepage or blog of the group or topic"
msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾"
#: lib/groupeditform.php:168
-#, fuzzy
msgid "Describe the group or topic"
-msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿"
+msgstr "à°—à±à°‚à°ªà±à°¨à°¿ లేదా విషయానà±à°¨à°¿ వివరించండి"
#: lib/groupeditform.php:170
#, php-format
@@ -5768,9 +5822,8 @@ msgid "Group"
msgstr "à°—à±à°‚à°ªà±"
#: lib/groupnav.php:101
-#, fuzzy
msgid "Blocked"
-msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
+msgstr "నిరోధించారà±"
#: lib/groupnav.php:102
#, php-format
@@ -5875,9 +5928,8 @@ msgid "Login with a username and password"
msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
#: lib/logingroupnav.php:86
-#, fuzzy
msgid "Sign up for a new account"
-msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°‚à°¡à°¿"
+msgstr "కొతà±à°¤ ఖాతా కొరకై నమోదà±à°šà±‡à°¸à±à°•à±‹à°‚à°¡à°¿"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
@@ -5920,8 +5972,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ఇపà±à°ªà±à°¡à± %2$sలో మీ నోటీసà±à°²à°¨à°¿ వింటà±à°¨à±à°¨à°¾à°°à±."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5947,19 +6006,19 @@ msgstr ""
"మీ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°¨à°¿ లేదా గమనింపà±à°² ఎంపికలనౠ%8$s వదà±à°¦ మారà±à°šà±à°•à±‹à°‚à°¡à°¿\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%sà°•à°¿ నోటీసà±à°²à± పంపించడానికి కొతà±à°¤ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5973,30 +6032,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s à°¸à±à°¥à°¿à°¤à°¿"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "à°ˆ ఫోనౠనంబరౠయొకà±à°• నిరà±à°§à°¾à°°à°£à°•à±ˆ వేచివà±à°‚ది."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6011,15 +6070,26 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) మీరేం చేసà±à°¤à±à°¨à±à°¨à°¾à°°à±‹ అని విసà±à°®à°¯à°‚ చెందà±à°¤à±à°¨à±à°¨à°¾à°°à± మరియౠà°à°µà±ˆà°¨à°¾ విశేషాలని à°µà±à°°à°¾à°¯à°®à°¨à°¿ మిమà±à°®à°²à±à°¨à°¿ "
+"ఆహà±à°µà°¾à°¨à°¿à°¸à±à°¤à±à°¨à±à°¨à°¾à°°à±.\n"
+"\n"
+"కాబటà±à°Ÿà°¿ మిమà±à°®à°²à±à°¨à°¿ విననివà±à°µà°‚à°¡à°¿ :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"à°ˆ ఈమెయిలà±à°•à±‡ à°¸à±à°ªà°‚దించకండి; ఇది వారికి వెళà±à°³à°¦à±.\n"
+"\n"
+"à°¶à±à°­à°¾à°¶à±€à°¸à±à°¸à±à°²à°¤à±‹,\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s à°¨à±à°‚à°¡à°¿ కొతà±à°¤ అంతరంగిక సందేశం"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6053,13 +6123,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) మీ నోటీసà±à°¨à°¿ ఇషà±à°Ÿà°ªà°¡à±à°¡à°¾à°°à±"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6097,7 +6167,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6108,13 +6178,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) మీకౠఒక నోటీసà±à°¨à°¿ పంపించారà±"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6175,7 +6245,7 @@ msgstr ""
"మీకౠఅంతరంగిక సందేశాలౠలేవà±. ఇతర వాడà±à°•à°°à±à°²à°¤à±‹ సంభాషణకై మీరౠవారికి అంతరంగిక సందేశాలౠ"
"పంపించవచà±à°šà±. మీ à°•à°‚à°Ÿà°¿à°•à°¿ మాతà±à°°à°®à±‡ కనబడేలా వారౠమీకౠసందేశాలౠపంపవచà±à°šà±."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "à°¨à±à°‚à°¡à°¿"
@@ -6333,27 +6403,26 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "సందరà±à°­à°‚లో"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "సృషà±à°Ÿà°¿à°¤à°‚"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "à°ˆ నోటీసà±à°ªà±ˆ à°¸à±à°ªà°‚దించండి"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "à°¸à±à°ªà°‚దించండి"
-#: lib/noticelist.php:674
-#, fuzzy
+#: lib/noticelist.php:666
msgid "Notice repeated"
-msgstr "నోటీసà±à°¨à°¿ తొలగించాం."
+msgstr "నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚చారà±"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -6426,7 +6495,7 @@ msgstr "మీరౠపంపిన సందేశాలà±"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6463,7 +6532,7 @@ msgstr "రోజà±à°µà°¾à°°à±€ సగటà±"
msgid "All groups"
msgstr "à°…à°¨à±à°¨à°¿ à°—à±à°‚à°ªà±à°²à±"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6487,7 +6556,7 @@ msgstr "విశేషం"
msgid "Popular"
msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯à°‚"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±."
@@ -6509,7 +6578,7 @@ msgstr "à°ˆ నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚à°šà±"
msgid "Revoke the \"%s\" role from this user"
msgstr "à°ˆ à°—à±à°‚à°ªà±à°¨à±à°‚à°¡à°¿ à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6610,6 +6679,50 @@ msgstr ""
msgid "None"
msgstr "à°à°®à±€à°²à±‡à°¦à±"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "అవతారపౠతాజాకరణ విఫలమైంది."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "దూరపౠపà±à°°à±Šà°ªà±ˆà°²à±à°¨à°¿ తాజాకరించటంలో పొరపాటà±"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6641,9 +6754,9 @@ msgid "Unsubscribe"
msgstr "చందామానà±"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
+msgstr "వాడà±à°•à°°à°¿ %s (%d) à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6692,56 +6805,56 @@ msgid "Moderator"
msgstr "సమనà±à°µà°¯à°•à°°à±à°¤"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 3fe578e08..8f59d8476 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:55+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:12+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Kabul et"
@@ -91,25 +91,25 @@ msgid "Save"
msgstr "Kaydet"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Böyle bir durum mesajı yok."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -122,7 +122,7 @@ 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:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s ve arkadaşları"
@@ -130,39 +130,39 @@ msgstr "%s ve arkadaşları"
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s ve arkadaşları"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -170,14 +170,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,66 +185,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s ve arkadaşları"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Onay kodu bulunamadı."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Kullanıcı güncellenemedi."
@@ -266,7 +266,7 @@ msgstr "Profil kaydedilemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -325,43 +325,43 @@ msgstr ""
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr ""
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Bu zaten sizin Jabber ID'niz."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
@@ -398,124 +398,124 @@ msgstr "Kullanıcı güncellenemedi."
msgid "Could not find target user."
msgstr "Kullanıcı güncellenemedi."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
"kullanılamaz. "
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Geçersiz bir takma ad."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Tam isim çok uzun (azm: 255 karakter)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "%s Geçersiz başlangıç sayfası"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "İstek bulunamadı!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "Bize o profili yollamadınız"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "OpenID formu yaratılamadı: %s"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "Profil"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Bize o profili yollamadınız"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr ""
@@ -531,15 +531,15 @@ msgstr "Geçersiz büyüklük."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -603,13 +603,13 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
#, fuzzy
msgid "Account"
msgstr "Hakkında"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -617,8 +617,8 @@ msgid "Nickname"
msgstr "Takma ad"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Parola"
@@ -634,11 +634,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -657,28 +657,28 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
msgid "Already repeated that notice."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "Avatar güncellendi."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "İstek bulunamadı!"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -688,32 +688,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Desteklenmeyen görüntü dosyası biçemi."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s adli kullanicinin durum mesajlari"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -728,12 +728,12 @@ msgstr "%s için cevaplar"
msgid "Repeats of %s"
msgstr "%s için cevaplar"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s adli kullanicinin durum mesajlari"
@@ -793,7 +793,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr ""
@@ -836,12 +836,12 @@ msgstr "Avatar güncellendi."
msgid "You already blocked that user."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -853,7 +853,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -863,7 +863,7 @@ msgstr "Durum mesajları"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Böyle bir kullanıcı yok."
@@ -873,7 +873,7 @@ msgstr "Böyle bir kullanıcı yok."
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -881,12 +881,12 @@ msgid "Yes"
msgstr ""
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1021,7 +1021,7 @@ msgstr "Bize o profili yollamadınız"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Giriş yapılmadı."
@@ -1085,7 +1085,7 @@ msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1126,50 +1126,59 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Geçersiz büyüklük."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Parolayı değiştir"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "Yeni durum mesajı"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "DeÄŸiÅŸtir"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Yeni durum mesajı"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Yeni durum mesajı"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1178,61 +1187,69 @@ msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Parolayı değiştir"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "BaÄŸlan"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Ara"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "GiriÅŸ"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1242,7 +1259,7 @@ msgstr ""
msgid "Save"
msgstr "Kaydet"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1528,7 +1545,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
@@ -1763,13 +1780,13 @@ msgstr "Kullanıcının profili yok."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1913,7 +1930,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr ""
@@ -2312,41 +2329,41 @@ msgstr "Bize o profili yollamadınız"
msgid "%1$s left group %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Zaten giriş yapılmış."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Yanlış kullanıcı adı veya parola."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "YetkilendirilmemiÅŸ."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "GiriÅŸ"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Parolamı unuttum veya kaybettim"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2354,11 +2371,15 @@ msgstr ""
"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
"ve parolanızı tekrar giriniz."
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
@@ -2560,31 +2581,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "BaÄŸlan"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2696,7 +2717,7 @@ msgid "6 or more characters"
msgstr "6 veya daha fazla karakter"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Onayla"
@@ -2708,11 +2729,11 @@ msgstr "yukarıdaki parolanın aynısı"
msgid "Change"
msgstr "DeÄŸiÅŸtir"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Parolalar birbirini tutmuyor."
@@ -2733,7 +2754,7 @@ msgid "Password saved."
msgstr "Parola kaydedildi."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2950,45 +2971,45 @@ msgstr ""
"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
"verilmez"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tam Ä°sim"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Başlangıç Sayfası"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Hakkında"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Yer"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
@@ -3028,7 +3049,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
@@ -3280,7 +3301,7 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
msgid "Password and confirmation do not match."
msgstr "Parola ve onaylaması birbirini tutmuyor."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
@@ -3288,73 +3309,95 @@ msgstr "Kullanıcı ayarlamada hata oluştu."
msgid "New password successfully saved. You are now logged in."
msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Onay kodu hatası."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Eposta adresi zaten var."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Geçersiz kullanıcı adı veya parola."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Eposta"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3363,7 +3406,7 @@ msgstr ""
"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
"numarası."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3382,7 +3425,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3462,7 +3505,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
msgid "You already repeated that notice."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Yarat"
@@ -3534,7 +3577,7 @@ msgstr "Bize o profili yollamadınız"
msgid "User doesn't have this role."
msgstr "Kullanıcının profili yok."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Avatar güncellendi."
@@ -3551,7 +3594,7 @@ msgstr "Kullanıcının profili yok."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3596,7 +3639,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3609,7 +3652,7 @@ msgid "Organization"
msgstr "Yer"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
@@ -4211,7 +4254,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4569,7 +4612,7 @@ msgstr ""
"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
"bulunmadıysanız \"İptal\" tuşuna basın. "
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4693,29 +4736,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Ä°statistikler"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4723,7 +4766,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4731,40 +4774,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "KiÅŸisel"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4807,48 +4850,48 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluştu."
#. 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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4959,128 +5002,128 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "KiÅŸisel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Parolayı değiştir"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "BaÄŸlan"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Abonelikler"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Geçersiz büyüklük."
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Çıkış"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Yeni hesap oluÅŸtur"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Kayıt"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "GiriÅŸ"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Yardım"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5088,74 +5131,74 @@ msgstr "Ara"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Yardım"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Hakkında"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "SSS"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Gizlilik"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Kaynak"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Ä°letiÅŸim"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5165,13 +5208,13 @@ msgstr ""
"hazırlanan anında mesajlaşma ağıdır. "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5183,57 +5226,57 @@ msgstr ""
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
#, fuzzy
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:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "Önce »"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5241,11 +5284,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5276,74 +5319,74 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Yeni durum mesajı"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "KiÅŸisel"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Yeni durum mesajı"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5481,12 +5524,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Parola kaydedildi."
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Parola kaydedildi."
@@ -5580,14 +5623,14 @@ msgstr "Tam Ä°sim"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6086,8 +6129,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6109,19 +6159,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Hakkında"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6135,30 +6185,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s durum"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6175,13 +6225,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6201,13 +6251,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6229,7 +6279,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6237,13 +6287,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6280,7 +6330,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr ""
@@ -6440,26 +6490,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "İçerik yok!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Yarat"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "cevapla"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Durum mesajları"
@@ -6534,7 +6584,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6572,7 +6622,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6597,7 +6647,7 @@ msgstr ""
msgid "Popular"
msgstr "KiÅŸi Arama"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Böyle bir belge yok."
@@ -6621,7 +6671,7 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Revoke the \"%s\" role from this user"
msgstr "Böyle bir kullanıcı yok."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6724,6 +6774,51 @@ msgstr ""
msgid "None"
msgstr ""
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Dosya yüklemede sistem hatası."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Avatar güncellemede hata."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Uzaktaki profili güncellemede hata oluştu"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6809,56 +6904,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index de2f4e803..93ef6b48a 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:58+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:17+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -25,7 +25,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
msgid "Access"
msgstr "ПогодитиÑÑŒ"
@@ -89,24 +89,24 @@ msgid "Save"
msgstr "Зберегти"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Ðемає такої Ñторінки."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -119,7 +119,7 @@ msgid "No such user."
msgstr "Такого кориÑтувача немає."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s та друзі, Ñторінка %2$d"
@@ -127,39 +127,39 @@ msgstr "%1$s та друзі, Ñторінка %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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s з друзÑми"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Стрічка допиÑів Ð´Ð»Ñ Ð´Ñ€ÑƒÐ·Ñ–Ð² %s (RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Стрічка допиÑів Ð´Ð»Ñ Ð´Ñ€ÑƒÐ·Ñ–Ð² %s (RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Стрічка допиÑів Ð´Ð»Ñ Ð´Ñ€ÑƒÐ·Ñ–Ð² %s (Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "Це Ñтрічка допиÑів %s Ñ– друзів, але вона поки що порожнÑ."
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -169,7 +169,7 @@ msgstr ""
"або напишіть щоÑÑŒ Ñамі."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -178,7 +178,7 @@ msgstr ""
"Ви можете [«розштовхати» %1$s](../%2$s) зі Ñторінки його профілю або [щоÑÑŒ "
"йому напиÑати](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,65 +188,65 @@ msgstr ""
"«розштовхати» %s або щоÑÑŒ йому напиÑати."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
msgid "You and friends"
msgstr "Ви з друзÑми"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API метод не знайдено."
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Цей метод потребує POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"Ви муÑите вÑтановити параметр «device» з одним зі значень: sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
msgid "Could not update user."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача."
@@ -266,7 +266,7 @@ msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -325,42 +325,42 @@ msgstr "ПрÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %s"
msgid "All the direct messages sent to %s"
msgstr "Ð’ÑÑ– прÑмі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлані до %s"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÐµÐ· текÑту!"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Ðадто довго. МакÑимальний розмір %d знаків."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "Отримувача не знайдено."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Ðе можна надіÑлати прÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачеві, Ñкий не Ñ” Вашим другом."
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Жодних ÑтатуÑів з таким ID."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Цей ÑÑ‚Ð°Ñ‚ÑƒÑ Ð²Ð¶Ðµ Ñ” обраним."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Ðе можна позначити Ñк обране."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr "Цей ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ñ” обраним."
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Ðе можна видалити зі ÑпиÑку обраних."
@@ -393,121 +393,121 @@ msgstr "Ðе вдалоÑÑŒ вÑтановити джерело кориÑтув
msgid "Could not find target user."
msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ цільового кориÑтувача."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно ÑкладатиÑÑŒ з літер нижнього регіÑтру Ñ– цифр, ніÑких "
"інтервалів."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Це Ñ–Ð¼â€™Ñ Ð²Ð¶Ðµ викориÑтовуєтьÑÑ. Спробуйте інше."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Це недійÑне Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Веб-Ñторінка має недійÑну URL-адреÑу."
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Повне Ñ–Ð¼â€™Ñ Ð·Ð°Ð´Ð¾Ð²Ð³Ðµ (255 знаків макÑимум)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "ÐžÐ¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий (%d знаків макÑимум)."
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Ð Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге (255 знаків макÑимум)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "Забагато додаткових імен! МакÑимум Ñтановить %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Помилкове додаткове ім’Ñ: «%s»."
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Додаткове Ñ–Ð¼â€™Ñ \"%s\" вже викориÑтовуєтьÑÑ. Спробуйте інше."
+msgstr "Додаткове Ñ–Ð¼â€™Ñ Â«%s» вже викориÑтовуєтьÑÑ. Спробуйте інше."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "Додаткове Ñ–Ð¼â€™Ñ Ð½Ðµ може бути таким Ñамим що й оÑновне."
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "Групу не знайдено."
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Ви вже Ñ” учаÑником цієї групи."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Ðдмін цієї групи заблокував Вашу приÑутніÑÑ‚ÑŒ в ній."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$s до групи %2$s."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Ви не Ñ” учаÑником цієї групи."
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, php-format
msgid "%s's groups"
msgstr "%s групи"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s групи, в Ñких %2$s бере учаÑÑ‚ÑŒ."
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s групи"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr "групи на %s"
@@ -522,15 +522,15 @@ msgstr "Ðевірний токен."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -598,12 +598,12 @@ msgstr ""
"довірÑєте."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "Ðкаунт"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +611,8 @@ msgid "Nickname"
msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -628,11 +628,11 @@ msgstr "Дозволити"
msgid "Allow or deny access to your account information."
msgstr "Дозволити або заборонити доÑтуп до Вашого облікового запиÑу."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Цей метод потребує або ÐÐПИСÐТИ, або ВИДÐЛИТИ."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Ви не можете видалити ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ кориÑтувача."
@@ -649,25 +649,25 @@ msgstr "Ðе можу повторити Ваш влаÑний допиÑ."
msgid "Already repeated that notice."
msgstr "Цей Ð´Ð¾Ð¿Ð¸Ñ Ð²Ð¶Ðµ повторено."
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
msgid "Status deleted."
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ðадто довго. МакÑимальний розмір допиÑу — %d знаків."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе знайдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -678,32 +678,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Формат не підтримуєтьÑÑ."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Обрані від %2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… від %2$s / %2$s."
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Оновленні відповіді %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s оновив цю відповідь на Ð´Ð¾Ð¿Ð¸Ñ Ð²Ñ–Ð´ %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s загальна Ñтрічка"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ уÑÑ–Ñ…!"
@@ -718,12 +718,12 @@ msgstr "Повторено Ð´Ð»Ñ %s"
msgid "Repeats of %s"
msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð½Ñ %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "ДопиÑи позначені з %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ñ– з %1$s на %2$s!"
@@ -780,7 +780,7 @@ msgid "Preview"
msgstr "ПереглÑд"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr "Видалити"
@@ -820,26 +820,26 @@ msgstr "Ðватару видалено."
msgid "You already blocked that user."
msgstr "Цього кориÑтувача вже заблоковано."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокувати кориÑтувача"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
"Впевнені, що бажаєте блокувати цього кориÑтувача? ПозаÑк, його буде "
-"відпиÑано від ВаÑ, він не зможе підпиÑитаÑÑ‚ÑŒ до Ð’Ð°Ñ Ñƒ майбутньому Ñ– Ви "
-"більше не отримуватимете жодних допиÑів від нього."
+"відпиÑано від ВаÑ, він не зможе підпиÑатиÑÑŒ до Ð’Ð°Ñ Ñƒ майбутньому Ñ– Ви більше "
+"не отримуватимете жодних допиÑів від нього."
#. TRANS: Button label on the user block form.
#. TRANS: Button label on the delete application form.
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -848,7 +848,7 @@ msgstr "ÐÑ–"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ðе блокувати цього кориÑтувача"
@@ -857,7 +857,7 @@ msgstr "Ðе блокувати цього кориÑтувача"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -865,11 +865,11 @@ msgid "Yes"
msgstr "Так"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати кориÑтувача"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð¾ÑÑŒ невдачею."
@@ -940,7 +940,7 @@ msgstr "Ðевизначений тип адреÑи %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
msgid "That address has already been confirmed."
-msgstr "Цю адреÑу вже було підтверджено."
+msgstr "Цю адреÑу вже підтверджено."
#. TRANS: Server error thrown on database error updating e-mail preferences.
#. TRANS: Server error thrown on database error removing a registered e-mail address.
@@ -970,7 +970,7 @@ msgstr "Підтвердити адреÑу"
#: actions/confirmaddress.php:161
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr "ÐдреÑу \"%s\" було підтверджено Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ акаунту."
+msgstr "ÐдреÑу «%s» підтверджено Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ акаунту."
#: actions/conversation.php:99
msgid "Conversation"
@@ -996,7 +996,7 @@ msgstr "Ви не Ñ” влаÑником цього додатку."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—."
@@ -1030,7 +1030,7 @@ msgstr "Видалити додаток"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ðе увійшли."
@@ -1059,7 +1059,7 @@ msgid "Do not delete this notice"
msgstr "Ðе видалÑти цей допиÑ"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr "Видалити допиÑ"
@@ -1099,45 +1099,53 @@ msgstr "Дизайн"
msgid "Design settings for this StatusNet site."
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñайту StatusNet."
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
msgid "Invalid logo URL."
msgstr "Помилкова URL-адреÑа логотипу."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, php-format
msgid "Theme not available: %s."
msgstr "Тема недоÑтупна: %s."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
msgid "Change logo"
msgstr "Змінити логотип"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
msgid "Site logo"
msgstr "Логотип Ñайту"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
msgid "Change theme"
msgstr "Змінити тему"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
msgid "Site theme"
msgstr "Тема Ñайту"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr "Тема Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñайту."
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Ð¡Ð²Ð¾Ñ Ñ‚ÐµÐ¼Ð°"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr "Ви можете завантажити Ñвою тему Ð´Ð»Ñ Ñайту StatusNet Ñк .ZIP архів."
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr "Змінити фонове зображеннÑ"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1147,57 +1155,65 @@ msgstr ""
"%1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr "Увімк."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr "Вимк."
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Увімкнути або вимкнути фонове зображеннÑ."
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr "ЗамоÑтити фон"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
msgid "Change colours"
msgstr "Змінити кольори"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
msgid "Content"
msgstr "ЗміÑÑ‚"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Бічна панель"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "ТекÑÑ‚"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
msgid "Links"
msgstr "ПоÑиланнÑ"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Додатково"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Свій CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr "За замовч."
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Оновити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° замовчуваннÑм"
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ПовернутиÑÑŒ до початкових налаштувань"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1207,7 +1223,7 @@ msgstr "ПовернутиÑÑŒ до початкових налаштувань"
msgid "Save"
msgstr "Зберегти"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr "Зберегти дизайн"
@@ -1315,7 +1331,7 @@ msgstr "Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий (%d знаків макÑимум)."
#: actions/editgroup.php:228 actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Помилкове додаткове ім’Ñ: \"%s\""
+msgstr "Помилкове додаткове ім’Ñ: «%s»"
#: actions/editgroup.php:258
msgid "Could not update group."
@@ -1385,7 +1401,7 @@ msgstr "СкаÑувати"
#. TRANS: Instructions for e-mail address input form.
#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
-msgstr "Електронна адреÑа, на зразок \"UserName@example.org\""
+msgstr "Електронна адреÑа, на зразок «UserName@example.org»"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
@@ -1444,7 +1460,7 @@ msgstr "ÐадÑилати мені лиÑта, коли хтоÑÑŒ має прÐ
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "ÐадÑилати мені лиÑта, коли на мій Ð´Ð¾Ð¿Ð¸Ñ Ð·â€™ÑвлÑєтьÑÑ \"@-відповідь\"."
+msgstr "ÐадÑилати мені лиÑта, коли на мій Ð´Ð¾Ð¿Ð¸Ñ Ð·â€™ÑвлÑєтьÑÑ Â«@-відповідь»."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:205
@@ -1477,7 +1493,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðе можна полагодити цю поштову адреÑу"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Це недійÑна електронна адреÑа."
@@ -1703,13 +1719,13 @@ msgstr "КориÑтувач вже має цю роль."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ðе визначено жодного профілю."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðе визначено профілю з таким ID."
@@ -1850,7 +1866,7 @@ msgstr "Ðадати цьому кориÑтувачеві права адмін
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s Ñтрічка"
@@ -1882,9 +1898,9 @@ msgid ""
msgstr ""
"Групи на Ñайті %%%%site.name%%%% дозволÑÑ‚ÑŒ Вам відшукати людей зі Ñпільними "
"інтереÑами. Лише приєднайтеÑÑ Ð´Ð¾ групи Ñ– надÑилайте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ уÑÑ–Ñ… Ñ—Ñ— "
-"учаÑників викориÑтовуючи проÑту команду \"!groupname\" у текÑÑ‚Ñ– "
-"повідомленнÑ. Ðе бачите групу, Ñка Ð’Ð°Ñ Ñ†Ñ–ÐºÐ°Ð²Ð¸Ñ‚ÑŒ? Спробуйте Ñ—Ñ— [знайти](%%%%"
-"action.groupsearch%%%%) або [Ñтворіть влаÑну!](%%%%action.newgroup%%%%)"
+"учаÑників викориÑтовуючи проÑту команду «!groupname» у текÑÑ‚Ñ– повідомленнÑ. "
+"Ðе бачите групу, Ñка Ð’Ð°Ñ Ñ†Ñ–ÐºÐ°Ð²Ð¸Ñ‚ÑŒ? Спробуйте Ñ—Ñ— [знайти](%%%%action."
+"groupsearch%%%%) або [Ñтворіть влаÑну!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1991,7 +2007,7 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Jabber або GTalk адреÑа, на зразок \"UserName@example.org\". Ðле Ñпершу "
+"Jabber або GTalk адреÑа, на зразок «UserName@example.org». Ðле Ñпершу "
"переконайтеÑÑ, що додали %s до ÑпиÑку контактів в Ñвоєму IM-клієнті або в "
"GTalk."
@@ -2279,41 +2295,41 @@ msgstr "Ви не Ñ” учаÑником цієї групи."
msgid "%1$s left group %2$s"
msgstr "%1$s залишив групу %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Тепер Ви увійшли."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Ðеточне Ñ–Ð¼â€™Ñ Ð°Ð±Ð¾ пароль."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Вхід на Ñайт"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Пам’Ñтати мене"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ðвтоматично входити у майбутньому; не Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿â€™ÑŽÑ‚ÐµÑ€Ñ–Ð² загального "
"кориÑтуваннÑ!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Загубили або забули пароль?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2321,14 +2337,17 @@ msgstr ""
"З міркувань безпеки, будь лаÑка, введіть ще раз Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль, перед тим Ñк "
"змінювати налаштуваннÑ."
-#: actions/login.php:270
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Увійти викориÑтовуючи Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль."
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Увійти викриÑтовуючи Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль. Ще не маєте імені кориÑтувача? "
-"[ЗареєÑтрувати](%%action.register%%) новий акаунт."
+"Ще не маєте імені кориÑтувача? [ЗареєÑтрувати](%%action.register%%) новий "
+"акаунт."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2465,12 +2484,12 @@ msgstr ""
#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð· \"%s\""
+msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð· «%s»"
#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Ð’ÑÑ– Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð° збігом з \"%s\" на %2$s!"
+msgstr "Ð’ÑÑ– Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð° збігом з «%s» на %2$s!"
#: actions/nudge.php:85
msgid ""
@@ -2530,30 +2549,30 @@ msgstr "Ви не дозволили жодним додаткам викориÑ
msgid "Developers can edit the registration settings for their applications "
msgstr "Розробники можуть змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑ”Ñтрації Ð´Ð»Ñ Ñ—Ñ…Ð½Ñ–Ñ… додатків "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ðµ має профілю."
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s має ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
msgstr "Тип зміÑту %s не підтримуєтьÑÑ."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr "URL-адреÑа %s лише в проÑтому HTTP, будь лаÑка."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримуєтьÑÑ."
@@ -2658,7 +2677,7 @@ msgid "6 or more characters"
msgstr "6 або більше знаків"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Підтвердити"
@@ -2670,11 +2689,11 @@ msgstr "Такий Ñамо, Ñк Ñ– пароль вище"
msgid "Change"
msgstr "Змінити"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Пароль має ÑкладатиÑÑŒ з 6-ти або більше знаків."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Паролі не Ñпівпадають."
@@ -2695,7 +2714,7 @@ msgid "Password saved."
msgstr "Пароль збережено."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr "ШлÑÑ…"
@@ -2899,43 +2918,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 літери нижнього регіÑтру Ñ– цифри, ніÑкої пунктуації або інтервалів"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Повне ім’Ñ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Веб-Ñторінка"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL-адреÑа Вашої веб-Ñторінки, блоґу, або профілю на іншому Ñайті"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишіть Ñебе та Ñвої інтереÑи (%d знаків)"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишіть Ñебе та Ñвої інтереÑи"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Про Ñебе"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "РозташуваннÑ"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Де Ви живете, на кшталт «МіÑто, облаÑÑ‚ÑŒ (регіон), країна»"
@@ -2978,7 +2997,7 @@ msgid ""
msgstr ""
"Ðвтоматично підпиÑуватиÑÑŒ до тих, хто підпиÑавÑÑ Ð´Ð¾ мене. (Слава роботам!)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (%d знаків макÑимум)."
@@ -2994,7 +3013,7 @@ msgstr "Мова задовга (50 знаків макÑимум)."
#: actions/profilesettings.php:253 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "ÐедійÑний теґ: \"%s\""
+msgstr "ÐедійÑний теґ: «%s»"
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
@@ -3076,7 +3095,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
"Це %%site.name%% — ÑÐµÑ€Ð²Ñ–Ñ [мікроблоґів](http://uk.wikipedia.org/wiki/"
-"Мікроблоггінг), Ñкий працює на вільному програмному забезпеченні [StatusNet]"
+"Мікроблогінг), Ñкий працює на вільному програмному забезпеченні [StatusNet]"
"(http://status.net/). [ПриєднуйтеÑÑŒ](%%action.register%%) зараз Ñ– зможете "
"розділити Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ð· друзÑми, родиною Ñ– колегами! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%"
"doc.help%%))"
@@ -3089,7 +3108,7 @@ msgid ""
"tool."
msgstr ""
"Це %%site.name%% — ÑÐµÑ€Ð²Ñ–Ñ [мікроблоґів](http://uk.wikipedia.org/wiki/"
-"Мікроблоггінг), Ñкий працює на вільному програмному забезпеченні [StatusNet]"
+"Мікроблогінг), Ñкий працює на вільному програмному забезпеченні [StatusNet]"
"(http://status.net/)."
#: actions/publictagcloud.php:57
@@ -3240,7 +3259,7 @@ msgstr "Пароль має ÑкладатиÑÑŒ з 6-ти або більше Ð
msgid "Password and confirmation do not match."
msgstr "Пароль та Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ñпівпадають."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Помилка в налаштуваннÑÑ… кориÑтувача."
@@ -3248,40 +3267,40 @@ msgstr "Помилка в налаштуваннÑÑ… кориÑтувача."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовий пароль уÑпішно збережено. Тепер Ви увійшли."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
"Пробачте, але лише Ñ‚Ñ–, кого було запрошено, мають змогу зареєÑтруватиÑÑŒ тут."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Даруйте, помилка у коді запрошеннÑ."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÑƒÑпішна"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "РеєÑтраціÑ"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "РеєÑтрацію не дозволено."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Ви не зможете зареєÑтруватиÑÑŒ, Ñкщо не погодитеÑÑŒ з умовами ліцензії."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Ð¦Ñ Ð°Ð´Ñ€ÐµÑа вже викориÑтовуєтьÑÑ."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "ÐедійÑне Ñ–Ð¼â€™Ñ Ð°Ð±Ð¾ пароль."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3289,35 +3308,57 @@ msgstr ""
"Ð¦Ñ Ñ„Ð¾Ñ€Ð¼Ð° дозволить вам Ñтворити новий акаунт. Ви зможете робити допиÑи Ñ– "
"будете в курÑÑ– Ñправ ваших друзів та колег. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 літери нижнього регіÑтра Ñ– цифри, ніÑкої пунктуації або інтервалів. "
"Ðеодмінно."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 або більше знаків. Ðеодмінно."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Такий Ñамо, Ñк Ñ– пароль вище. Ðеодмінно."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Пошта"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "ВикориÑтовуєтьÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½ÑŒ, оголошень та Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Повне ім’Ñ, звіÑно ж Ваше Ñправжнє Ñ–Ð¼â€™Ñ :)"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr "Я розумію, що зміÑÑ‚ Ñ– дані %1$s Ñ” приватними Ñ– конфіденційними."
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "ÐвторÑькі права на мої текÑти Ñ– файли належать %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr "ÐвторÑькі права на мої текÑти Ñ– файли залишаютьÑÑ Ð·Ð° мною."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr "Ð’ÑÑ– права захищені."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3326,7 +3367,7 @@ msgstr ""
"Мої текÑти Ñ– файли доÑтупні під %s, окрім цих приватних даних: пароль, "
"електронна адреÑа, адреÑа IM, телефонний номер."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3359,7 +3400,7 @@ msgstr ""
"ДÑкуємо, що зареєÑтрувалиÑÑŒ у наÑ, Ñ–, ÑподіваємоÑÑŒ, Вам ÑподобаєтьÑÑ Ð½Ð°Ñˆ "
"ÑервіÑ."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3440,7 +3481,7 @@ msgstr "Ви не можете повторювати Ñвої влаÑні до
msgid "You already repeated that notice."
msgstr "Ви вже повторили цей допиÑ."
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
msgid "Repeated"
msgstr "Повторено"
@@ -3514,7 +3555,7 @@ msgstr "Ви не можете позбавлÑти кориÑтувачів Ñ€Ð
msgid "User doesn't have this role."
msgstr "КориÑтувач не має цієї ролі."
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "StatusNet"
@@ -3528,7 +3569,7 @@ msgstr "КориÑтувача ізольовано доки наберетьÑÑ
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr "СеÑÑ–Ñ—"
@@ -3571,7 +3612,7 @@ msgid "Icon"
msgstr "Іконка"
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
msgid "Name"
msgstr "Ім’Ñ"
@@ -3582,7 +3623,7 @@ msgid "Organization"
msgstr "ОрганізаціÑ"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "ОпиÑ"
@@ -3778,10 +3819,11 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
"**%s** це група на %%%%site.name%%%% — ÑервіÑÑ– [мікроблоґів](http://uk."
-"wikipedia.org/wiki/Мікроблоггінг), Ñкий працює на вільному програмному "
+"wikipedia.org/wiki/Мікроблогінг), Ñкий працює на вільному програмному "
"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблÑÑ‚ÑŒ "
-"короткі допиÑи про Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° інтереÑи. [ПриєднуйтеÑÑŒ](%%action.register%"
-"%) зараз Ñ– долучітьÑÑ Ð´Ð¾ ÑпілкуваннÑ! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%doc.help%%))"
+"короткі допиÑи про Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° інтереÑи. [ПриєднуйтеÑÑŒ](%%%%action.register"
+"%%%%) зараз Ñ– долучітьÑÑ Ð´Ð¾ ÑпілкуваннÑ! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%%%doc.help%%%"
+"%))"
#: actions/showgroup.php:469
#, php-format
@@ -3791,10 +3833,10 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** це група кориÑтувачів на %%site.name%% — ÑервіÑÑ– [мікроблоґів](http://"
-"uk.wikipedia.org/wiki/Мікроблоггінг), Ñкий працює на вільному програмному "
-"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблÑÑ‚ÑŒ "
-"короткі допиÑи про Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° інтереÑи. "
+"**%s** це група кориÑтувачів на %%%%site.name%%%% — ÑервіÑÑ– [мікроблоґів]"
+"(http://uk.wikipedia.org/wiki/Мікроблогінг), Ñкий працює на вільному "
+"програмному забезпеченні [StatusNet](http://status.net/). Члени цієї групи "
+"роблÑÑ‚ÑŒ короткі допиÑи про Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° інтереÑи. "
#: actions/showgroup.php:497
msgid "Admins"
@@ -3888,10 +3930,10 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
"**%s** кориÑтуєтьÑÑ %%%%site.name%%%% — ÑервіÑом [мікроблоґів](http://uk."
-"wikipedia.org/wiki/Мікроблоґ), Ñкий працює на вільному програмному "
-"забезпеченні [StatusNet](http://status.net/). [ПриєднуйтеÑÑŒ](%%action."
-"register%%) зараз Ñ– Ñлідкуйте за допиÑами **%s**, також на Ð’Ð°Ñ Ñ‡ÐµÐºÐ°Ñ” багато "
-"іншого! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%doc.help%%))"
+"wikipedia.org/wiki/Мікроблогінг), Ñкий працює на вільному програмному "
+"забезпеченні [StatusNet](http://status.net/). [ПриєднуйтеÑÑŒ](%%%%action."
+"register%%%%) зараз Ñ– Ñлідкуйте за допиÑами **%s**, також на Ð’Ð°Ñ Ñ‡ÐµÐºÐ°Ñ” "
+"багато іншого! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3901,7 +3943,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** Ñ” влаÑником акаунту на Ñайті %%%%site.name%%%% — ÑервіÑÑ– [мікроблоґів]"
-"(http://uk.wikipedia.org/wiki/Мікроблоггінг), Ñкий працює на вільному "
+"(http://uk.wikipedia.org/wiki/Мікроблогінг), Ñкий працює на вільному "
"програмному забезпеченні [StatusNet](http://status.net/). "
#: actions/showstream.php:305
@@ -4038,11 +4080,12 @@ msgstr "МакÑимальна довжина Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÑайтÑ
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr "ТекÑÑ‚ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñайту"
+msgstr "ТекÑÑ‚ повідомленнÑ"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr "ТекÑÑ‚ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñайту (255 Ñимволів макÑимум; HTML дозволено)"
+msgstr ""
+"ТекÑÑ‚ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñайту (255 Ñимволів макÑимум; деÑкий HTML дозволено)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
@@ -4204,7 +4247,7 @@ msgstr "Код не введено"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr "Снепшоти"
@@ -4493,7 +4536,7 @@ msgstr "Помилковий текÑÑ‚ привітаннÑ. МакÑималь
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr "Помилкова підпиÑка за замовчуваннÑм: '%1$s' не Ñ” кориÑтувачем."
+msgstr "Помилкова підпиÑка за замовчуваннÑм: «%1$s» не Ñ” кориÑтувачем."
#. TRANS: Link description in user account settings menu.
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
@@ -4556,7 +4599,7 @@ msgstr ""
"підпиÑатиÑÑŒ на допиÑи цього кориÑтувача. Якщо Ви не збиралиÑÑŒ підпиÑуватиÑÑŒ "
"ні на чиї допиÑи, проÑто натиÑніть «Відмінити»."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "ЛіцензіÑ"
@@ -4617,32 +4660,32 @@ msgstr "URI Ñлухача «%s» тут не знайдено"
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr "URI Ñлухача ‘%s’ задовге."
+msgstr "URI Ñлухача «%s» задовге."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr "URI Ñлухача ‘%s’ це локальний кориÑтувач"
+msgstr "URI Ñлухача «%s» це локальний кориÑтувач"
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr "URL-адреÑа профілю ‘%s’ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ кориÑтувача."
+msgstr "URL-адреÑа профілю «%s» Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ кориÑтувача."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr "URL-адреÑа автари ‘%s’ помилкова."
+msgstr "URL-адреÑа аватари «%s» помилкова."
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Ðе можна прочитати URL аватари ‘%s’."
+msgstr "Ðе можна прочитати URL аватари «%s»."
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Ðеправильний тип Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ URL-адреÑи аватари ‘%s’."
+msgstr "Ðеправильний тип Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ URL-адреÑи аватари «%s»."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
@@ -4686,18 +4729,18 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s на %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr "StatusNet %s"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -4706,11 +4749,11 @@ msgstr ""
"Цей Ñайт працює на %1$s, верÑÑ–Ñ %2$s. ÐвторÑькі права 2008-2010 StatusNet, "
"Inc. і розробники."
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr "Розробники"
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4722,7 +4765,7 @@ msgstr ""
"Ñ—Ñ… було опубліковано Free Software Foundation, 3-Ñ‚Ñ Ð²ÐµÑ€ÑÑ–Ñ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ— або (на "
"Ваш розÑуд) будь-Ñка подальша верÑÑ–Ñ. "
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4734,7 +4777,7 @@ msgstr ""
"ПРИДÐТÐОСТІ ДЛЯ ДОСЯГÐЕÐÐЯ ПЕВÐОЇ МЕТИ. Щодо більш детальних роз’ÑÑнень, "
"ознайомтеÑÑŒ з умовами GNU Affero General Public License. "
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
@@ -4743,20 +4786,20 @@ msgstr ""
"Разом з програмою Ви маєте отримати копію ліцензійних умов GNU Affero "
"General Public License. Якщо ні, перейдіть на %s."
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr "Додатки"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
msgid "Version"
msgstr "ВерÑÑ–Ñ"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -4765,12 +4808,12 @@ msgstr ""
"ÐÑ–, файл не може бути більшим за %d байтів, а те, що Ви хочете надіÑлати, "
"важить %d байтів. Спробуйте меншу верÑÑ–ÑŽ."
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів."
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Розміри цього файлу перевищують Вашу міÑÑчну квоту на %d байтів."
@@ -4809,27 +4852,27 @@ msgid "Could not update message with new URI."
msgstr "Ðе можна оновити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· новим URI."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Помилка бази даних при додаванні хеш-теґу: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
msgstr "Проблема при збереженні допиÑу. Ðадто довге."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при збереженні допиÑу. Ðевідомий кориÑтувач."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Дуже багато допиÑів за короткий термін; ходіть подихайте повітрÑм Ñ– "
"повертайтеÑÑŒ за кілька хвилин."
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4837,21 +4880,21 @@ msgstr ""
"Дуже багато повідомлень за короткий термін; ходіть подихайте повітрÑм Ñ– "
"повертайтеÑÑŒ за кілька хвилин."
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надÑилати допиÑи до цього Ñайту."
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Проблема при збереженні допиÑу."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4952,188 +4995,188 @@ msgid "Untitled page"
msgstr "Сторінка без заголовку"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "Відправна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "ПерÑональний профіль Ñ– Ñтрічка друзів"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
msgctxt "MENU"
msgid "Personal"
msgstr "ОÑобиÑте"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адреÑу, аватару, пароль, профіль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· ÑервіÑами"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "З’єднаннÑ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Змінити конфігурацію Ñайту"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr "Ðдмін"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ЗапроÑÑ–Ñ‚ÑŒ друзів та колег приєднатиÑÑŒ до Ð’Ð°Ñ Ð½Ð° %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
msgctxt "MENU"
msgid "Invite"
msgstr "ЗапроÑити"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Вийти з Ñайту"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
msgctxt "MENU"
msgid "Logout"
msgstr "Вийти"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Створити новий акаунт"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
msgctxt "MENU"
msgid "Register"
msgstr "РеєÑтраціÑ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Увійти на Ñайт"
-#: lib/action.php:481
+#: lib/action.php:491
msgctxt "MENU"
msgid "Login"
msgstr "Увійти"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:487
+#: lib/action.php:497
msgctxt "MENU"
msgid "Help"
msgstr "Довідка"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пошук людей або текÑтів"
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr "Пошук"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
msgid "Site notice"
msgstr "Об’Ñви на Ñайті"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "ОглÑд"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
msgid "Page notice"
msgstr "Ð—Ð°ÑƒÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñторінки"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr "ДругорÑдна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Допомога"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Про"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "ЧаП"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr "Умови"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "ПриватніÑÑ‚ÑŒ"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Джерело"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr "Бедж"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5143,13 +5186,13 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** — це ÑÐµÑ€Ð²Ñ–Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð²."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5161,55 +5204,55 @@ msgstr ""
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
msgid "Site content license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð·Ð¼Ñ–Ñту Ñайту"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "ЗміÑÑ‚ Ñ– дані %1$s Ñ” приватними Ñ– конфіденційними."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "ÐвторÑькі права на зміÑÑ‚ Ñ– дані належать %1$s. Ð’ÑÑ– права захищено."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"ÐвторÑькі права на зміÑÑ‚ Ñ– дані належать розробникам. Ð’ÑÑ– права захищено."
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "ВеÑÑŒ зміÑÑ‚ Ñ– дані %1$s доÑтупні на умовах ліцензії %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
msgid "Before"
msgstr "Ðазад"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Ð’ очікуванні кореневого елементу веб-Ñтрічки, отримали цілий документ XML."
@@ -5218,11 +5261,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr "Поки що не можу обробити віддалений контент."
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr "Поки що не можу обробити вбудований XML контент."
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr "Поки що не можу обробити вбудований контент Base64."
@@ -5253,64 +5296,64 @@ msgid "Unable to delete design setting."
msgstr "Ðемає можливоÑÑ‚Ñ– видалити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ."
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
msgid "Basic site configuration"
msgstr "ОÑновна ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ñайту"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
msgctxt "MENU"
msgid "Site"
msgstr "Сайт"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
msgid "Design configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
msgctxt "MENU"
msgid "Design"
msgstr "Дизайн"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
msgid "User configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "КориÑтувач"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
msgid "Access configuration"
msgstr "ПрийнÑти конфігурацію"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
msgid "Paths configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑˆÐ»Ñху"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
msgid "Sessions configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑеÑій"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
msgid "Edit site notice"
msgstr "Редагувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñайту"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
msgid "Snapshots configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð½Ñ–Ð¼ÐºÑ–Ð²"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-реÑÑƒÑ€Ñ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ” дозвіл типу «читаннÑ-запиÑ», але у Ð²Ð°Ñ Ñ” лише доÑтуп Ð´Ð»Ñ "
@@ -5443,11 +5486,11 @@ msgstr "ДопиÑи, до Ñких прикріплено це вкладенн
msgid "Tags for this attachment"
msgstr "Теґи Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вкладеннÑ"
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ пароль"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Змінювати пароль не дозволено"
@@ -5529,9 +5572,9 @@ msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$s до г
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s."
+msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5541,14 +5584,14 @@ msgstr "Повне ім’Ñ: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "РозташуваннÑ: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Веб-Ñторінка: %s"
@@ -5902,7 +5945,7 @@ msgstr "Вперед"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr "Ðадати цьому кориÑтувачеві роль \"%s\""
+msgstr "Ðадати цьому кориÑтувачеві роль «%s»"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -6082,8 +6125,18 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s тепер Ñлідкує за Вашими допиÑами на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+"Якщо Ви вважаєте, що цей акаунт викориÑтовуєтьÑÑ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¾Ð¼Ñ–Ñ€Ð½Ð¾, Ви можете "
+"заблокувати його у ÑпиÑку Ñвоїх підпиÑчиків Ñ– повідомити адмініÑтраторів "
+"Ñайту про факт Ñпаму на %s"
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6109,19 +6162,19 @@ msgstr ""
"Змінити електронну адреÑу або умови ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ â€” %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Про Ñебе: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðова електронна адреÑа Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ на %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6143,18 +6196,18 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ÑтатуÑ"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¡ÐœÐ¡"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
@@ -6162,13 +6215,13 @@ msgstr ""
"ÑкориÑтавшиÑÑŒ даним кодом:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Ð’Ð°Ñ Ñпробував «розштовхати» %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6196,13 +6249,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ðове приватне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6236,13 +6289,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додав(ла) Ваш Ð´Ð¾Ð¿Ð¸Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ…"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6280,7 +6333,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6291,13 +6344,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) пропонує до Вашої уваги наÑтупний допиÑ"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6360,7 +6413,7 @@ msgstr ""
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð°Ð±Ð¸ долучити кориÑтувачів до розмови. Такі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ñ‡Ð¸Ñ‚Ðµ "
"лише Ви."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "від"
@@ -6519,23 +6572,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgid "at"
msgstr "в"
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
msgid "in context"
msgstr "в контекÑÑ‚Ñ–"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr "ВідповіÑти на цей допиÑ"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "ВідповіÑти"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ð»Ð¸"
@@ -6608,7 +6661,7 @@ msgstr "ÐадіÑлані вами повідомленнÑ"
msgid "Tags in %s's notices"
msgstr "Теґи у допиÑах %s"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr "Ðевідомо"
@@ -6634,7 +6687,7 @@ msgstr "ІД"
#: lib/profileaction.php:196
msgid "Member since"
-msgstr "З нами від"
+msgstr "РеєÑтраціÑ"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
@@ -6645,7 +6698,7 @@ msgstr "Середньодобове"
msgid "All groups"
msgstr "Ð’ÑÑ– групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Метод не виконуєтьÑÑ."
@@ -6669,7 +6722,7 @@ msgstr "ПоÑтаті"
msgid "Popular"
msgstr "ПопулÑрне"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Ðемає аргументів return-to."
@@ -6688,9 +6741,9 @@ msgstr "Повторити цей допиÑ"
#: lib/revokeroleform.php:91
#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Відкликати роль \"%s\" Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ кориÑтувача"
+msgstr "Відкликати роль «%s» Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ кориÑтувача"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "КориÑтувача Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾ÐºÐ¾Ñ€Ð¸Ñтувацького режиму не визначено."
@@ -6788,6 +6841,52 @@ msgstr "Хмарка теґів (позначки, Ñкими Ви позначÐ
msgid "None"
msgstr "ПуÑто"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr "Цей Ñервер не може опрацювати Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚ÐµÐ¼Ð¸ без підтримки ZIP."
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr "Завантажити тему не вдалоÑÑ Ð°Ð±Ð¾ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+msgid "Failed saving theme."
+msgstr "Помилка при збереженні теми."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr "Ðевірна тема: хибна Ñтруктура каталогів."
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+"Тема, що Ñ—Ñ— було завантажено, надто велика; без компреÑÑ–Ñ— розмір має "
+"Ñтановити менше ніж %d байтів."
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr "Ð’ архіві з темою Ñ” помилка: відÑутній файл css/display.css"
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Тема міÑтить неприпуÑтиме Ñ–Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ñƒ або теки. ВикориÑтовуйте літери "
+"Ñтандарту ASCII, цифри, знаки підкреÑÐ»ÐµÐ½Ð½Ñ Ñ‚Ð° мінуÑу."
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr "Тема міÑтить файл типу «.%s», Ñкий Ñ” неприпуÑтимим."
+
+#: lib/themeuploader.php:234
+msgid "Error opening theme archive."
+msgstr "Помилка при відкритті архіву з темою."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr "Топ-допиÑувачі"
@@ -6868,56 +6967,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "міÑÑць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "близько %d міÑÑців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 9f6fd0b16..cc5899b9e 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:50:02+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:22+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -20,7 +20,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "Chấp nhận"
@@ -90,25 +90,25 @@ msgid "Save"
msgstr "LÆ°u"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "Không có tin nhắn nào."
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -121,7 +121,7 @@ msgid "No such user."
msgstr "Không có user nào."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s và bạn bè"
@@ -129,39 +129,39 @@ msgstr "%s và bạn bè"
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s và bạn bè"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Chá»n những ngÆ°á»i bạn của %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Chá»n những ngÆ°á»i bạn của %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Chá»n những ngÆ°á»i bạn của %s"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -169,14 +169,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -184,66 +184,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s và bạn bè"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Phương thức API không tìm thấy!"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "Phương thức này yêu cầu là POST."
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "Không thể cập nhật thành viên."
@@ -265,7 +265,7 @@ msgstr "Không thể lưu hồ sơ cá nhân."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -325,45 +325,45 @@ msgstr "Tin nhắn riêng"
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
#, fuzzy
msgid "No message text!"
msgstr "Không có tin nhắn nào."
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "Quá dài. Tối đa là 140 ký tự."
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
#, fuzzy
msgid "Recipient user not found."
msgstr "Không tìm thấy user."
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Không thể tạo favorite."
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
#, fuzzy
msgid "That status is not a favorite."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
#, fuzzy
msgid "Could not delete favorite."
msgstr "Không thể tạo favorite."
@@ -402,122 +402,122 @@ msgstr "Không thể lấy lại các tin nhắn ưa thích"
msgid "Could not find target user."
msgstr "Không tìm thấy bất kỳ trạng thái nào."
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Biệt hiệu phải là chữ viết thÆ°á»ng hoặc số và không có khoảng trắng."
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Biệt hiệu không hợp lệ."
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Trang chủ không phải là URL"
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Trang chủ '%s' không hợp lệ"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "Phương thức API không tìm thấy!"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "Bạn đã theo những ngÆ°á»i này:"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "%s và nhóm"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "Bạn chưa cập nhật thông tin riêng"
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, fuzzy, php-format
msgid "%s groups"
msgstr "%s và nhóm"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, fuzzy, php-format
msgid "groups on %s"
msgstr "Mã nhóm"
@@ -533,15 +533,15 @@ msgstr "Kích thước không hợp lệ."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -605,13 +605,13 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
#, fuzzy
msgid "Account"
msgstr "Giới thiệu"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +619,8 @@ msgid "Nickname"
msgstr "Biệt danh"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Mật khẩu"
@@ -636,11 +636,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "Bạn đã không xóa trạng thái của những ngÆ°á»i khác."
@@ -659,27 +659,27 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoáº
msgid "Already repeated that notice."
msgstr "Xóa tin nhắn"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "Hình đại diện đã được cập nhật."
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Quá dài. Tối đa là 140 ký tự."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "Không tìm thấy"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -689,32 +689,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "Không hỗ trợ kiểu file ảnh này."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Tất cả các cập nhật của %s"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Các cập nhật Ä‘ang trả lá»i tá»›i %2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, fuzzy, php-format
msgid "%s public timeline"
msgstr "Dòng tin công cộng"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s cập nhật từ tất cả má»i ngÆ°á»i!"
@@ -729,12 +729,12 @@ msgstr "Trả lá»i cho %s"
msgid "Repeats of %s"
msgstr "Trả lá»i cho %s"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Thông báo được gắn thẻ %s"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Dòng tin nhắn cho %s"
@@ -795,7 +795,7 @@ msgid "Preview"
msgstr "Xem trÆ°á»›c"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -840,12 +840,12 @@ msgstr "Hình đại diện đã được cập nhật."
msgid "You already blocked that user."
msgstr "Bạn đã theo những ngÆ°á»i này:"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Ban user"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -857,7 +857,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -867,7 +867,7 @@ msgstr "Không"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Bá» chặn ngÆ°á»i dùng này"
@@ -877,7 +877,7 @@ msgstr "Bá» chặn ngÆ°á»i dùng này"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -886,12 +886,12 @@ msgid "Yes"
msgstr "Có"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ban user"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -1060,7 +1060,7 @@ msgstr "Xóa tin nhắn"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Chưa đăng nhập."
@@ -1091,7 +1091,7 @@ msgid "Do not delete this notice"
msgstr "Không thể xóa tin nhắn này."
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -1134,52 +1134,61 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "Kích thước không hợp lệ."
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Trang này không phải là phÆ°Æ¡ng tiện truyá»n thông mà bạn chấp nhận."
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "Thay đổi mật khẩu của bạn"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "ThÆ° má»i"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "Thay đổi"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "Thông báo mới"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "Thông báo mới"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
#, fuzzy
msgid "Change background image"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
#, fuzzy
msgid "Background"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1189,62 +1198,70 @@ msgstr ""
"vỠbạn."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Thay đổi mật khẩu của bạn"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Kết nối"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Tìm kiếm"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "Chuỗi bất kỳ"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Äăng nhập"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1254,7 +1271,7 @@ msgstr ""
msgid "Save"
msgstr "LÆ°u"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
#, fuzzy
msgid "Save design"
msgstr "LÆ°u"
@@ -1555,7 +1572,7 @@ msgid "Cannot normalize that email address"
msgstr "Không thể bình thÆ°á»ng hóa địa chỉ GTalk này"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Äịa chỉ email không hợp lệ."
@@ -1803,13 +1820,13 @@ msgstr "NgÆ°á»i dùng không có thông tin."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
#, fuzzy
msgid "No profile with that ID."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
@@ -1959,7 +1976,7 @@ msgstr "Kênh mà bạn tham gia"
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, fuzzy, php-format
msgid "%s timeline"
msgstr "Dòng tin nhắn của %s"
@@ -2394,40 +2411,40 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
msgid "%1$s left group %2$s"
msgstr "%s và nhóm"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Äã đăng nhập."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Äăng nhập"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mất hoặc quên mật khẩu?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2435,11 +2452,15 @@ msgstr ""
"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
"đổi trong Ä‘iá»u chỉnh."
-#: actions/login.php:270
-#, php-format
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
+
+#: actions/login.php:295
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
@@ -2650,31 +2671,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "Tin nhắn không có hồ sơ cá nhân"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Trạng thái của %1$s vào %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "Kết nối"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -2789,7 +2810,7 @@ msgid "6 or more characters"
msgstr "Nhiá»u hÆ¡n 6 ký tá»±"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Xác nhận"
@@ -2801,12 +2822,12 @@ msgstr "Cùng mật khẩu ở trên"
msgid "Change"
msgstr "Thay đổi"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
#, fuzzy
msgid "Password must be 6 or more characters."
msgstr "Mật khẩu phải nhiá»u hÆ¡n 6 ký tá»±."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Mật khẩu không khớp."
@@ -2827,7 +2848,7 @@ msgid "Password saved."
msgstr "Äã lÆ°u mật khẩu."
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -3048,44 +3069,44 @@ msgstr "Hồ sơ này không biết"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 chữ cái thÆ°á»ng hoặc là chữ số, không có dấu chấm hay "
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tên đầy đủ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL vỠTrang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Nói vỠbạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Nói vỠbạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Lý lịch"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Thành phố"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
@@ -3125,7 +3146,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Tá»± Ä‘á»™ng theo những ngÆ°á»i nào đăng ký theo tôi"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
@@ -3381,7 +3402,7 @@ msgstr "Mật khẩu phải nhiá»u hÆ¡n 6 ký tá»±."
msgid "Password and confirmation do not match."
msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Lỗi xảy ra khi tạo thành viên."
@@ -3389,82 +3410,104 @@ msgstr "Lỗi xảy ra khi tạo thành viên."
msgid "New password successfully saved. You are now logged in."
msgstr "Mật khẩu má»›i đã được lÆ°u. Bạn có thể đăng nhập ngay bây giá»."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Lỗi xảy ra với mã xác nhận."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Äăng ký thành công"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Äăng ký"
-#: actions/register.php:135
+#: actions/register.php:142
#, fuzzy
msgid "Registration not allowed."
msgstr "Biệt hiệu không được cho phép."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoản."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Äịa chỉ email đã tồn tại."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 chữ cái thÆ°á»ng hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt "
"buá»™c."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Nhiá»u hÆ¡n 6 ký tá»±. Bắt buá»™c"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "HỠtên đầy đủ của bạn, tốt nhất là tên thật của bạn."
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3495,7 +3538,7 @@ msgstr ""
"\n"
"Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3582,7 +3625,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoáº
msgid "You already repeated that notice."
msgstr "Bạn đã theo những ngÆ°á»i này:"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "Tạo"
@@ -3654,7 +3697,7 @@ msgstr "Bạn đã theo những ngÆ°á»i này:"
msgid "User doesn't have this role."
msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "Hình đại diện đã được cập nhật."
@@ -3671,7 +3714,7 @@ msgstr "NgÆ°á»i dùng không có thông tin."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3717,7 +3760,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3730,7 +3773,7 @@ msgid "Organization"
msgstr "ThÆ° má»i đã gá»­i"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
msgstr "Mô tả"
@@ -4352,7 +4395,7 @@ msgstr "Không có mã nào được nhập"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4713,7 +4756,7 @@ msgstr ""
"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
"của há», hãy nhấn \"Hủy bá»\""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4844,29 +4887,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "Số liệu thống kê"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4874,7 +4917,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4882,40 +4925,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "Cá nhân"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4961,48 +5004,48 @@ msgid "Could not update message with new URI."
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:249
+#: classes/Notice.php:255
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -5114,57 +5157,57 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Cá nhân"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "Kết nối"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Tôi theo"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
@@ -5173,71 +5216,71 @@ msgstr ""
"của bạn tham gia vào dịch vụ này."
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "ThÆ° má»i"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Thoát"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Tạo tài khoản mới"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Äăng ký"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Äăng nhập"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hướng dẫn"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5245,75 +5288,75 @@ msgstr "Tìm kiếm"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "Hướng dẫn"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "Giới thiệu"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "Riêng tư"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "Nguồn"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:784
+#: lib/action.php:794
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5323,13 +5366,13 @@ msgstr ""
"%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5341,57 +5384,57 @@ msgstr ""
"licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
#, fuzzy
msgid "After"
msgstr "Sau"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "TrÆ°á»›c"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5399,11 +5442,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5437,74 +5480,74 @@ msgid "Unable to delete design setting."
msgstr "Không thể lưu thông tin Twitter của bạn!"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "Xac nhan dia chi email"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "ThÆ° má»i"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "Xác nhận SMS"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Cá nhân"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "Xác nhận SMS"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "Xác nhận SMS"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "Xác nhận SMS"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "Xác nhận SMS"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "Thông báo mới"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "Xác nhận SMS"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5640,12 +5683,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "Äã lÆ°u mật khẩu."
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Äã lÆ°u mật khẩu."
@@ -5743,14 +5786,14 @@ msgstr "Tên đầy đủ"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thành phố: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
@@ -6274,8 +6317,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6297,19 +6347,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Thành phố: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Dia chi email moi de gui tin nhan den %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6331,30 +6381,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, fuzzy, php-format
msgid "%s status"
msgstr "Trạng thái của %1$s vào %2$s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Xác nhận SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Äó không phải là số Ä‘iện thoại của bạn."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6371,13 +6421,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Bạn có tin nhắn riêng từ %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6411,13 +6461,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6452,7 +6502,7 @@ msgstr ""
"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6460,13 +6510,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6503,7 +6553,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr " từ "
@@ -6667,26 +6717,26 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "Không có nội dung!"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "Tạo"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
#, fuzzy
msgid "Reply to this notice"
msgstr "Trả lá»i tin nhắn này"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr "Trả lá»i"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "Tin đã gửi"
@@ -6764,7 +6814,7 @@ msgstr "Thư bạn đã gửi"
msgid "Tags in %s's notices"
msgstr "cảnh báo tin nhắn"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "Không tìm thấy action"
@@ -6804,7 +6854,7 @@ msgstr ""
msgid "All groups"
msgstr "Nhóm"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6831,7 +6881,7 @@ msgstr ""
msgid "Popular"
msgstr "Tên tài khoản"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Không có tài liệu nào."
@@ -6855,7 +6905,7 @@ msgstr "Trả lá»i tin nhắn này"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ban user"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6963,6 +7013,51 @@ msgstr ""
msgid "None"
msgstr "Không"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "Hệ thống xảy ra lỗi trong khi tải file."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Cập nhật hình đại diện không thành công."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+
#: lib/topposterssection.php:74
#, fuzzy
msgid "Top posters"
@@ -7052,56 +7147,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "vài giây trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1 phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1 giá» trÆ°á»›c"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d giá» trÆ°á»›c"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "1 ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "1 tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index cd34a3499..d9afdf9e9 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:50:08+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:26+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "接å—"
@@ -43,7 +43,7 @@ msgstr "注册"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "è¦ç¦æ­¢åŒ¿å用户(未登录)æµè§ˆç½‘ç«™å—?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
@@ -55,7 +55,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
@@ -66,13 +66,13 @@ 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
#, fuzzy
msgid "Closed"
-msgstr "阻止"
+msgstr "已关闭"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
@@ -93,25 +93,25 @@ msgid "Save"
msgstr "ä¿å­˜"
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "没有该页é¢"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -124,47 +124,47 @@ msgid "No such user."
msgstr "没有这个用户。"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
-#, fuzzy, php-format
+#: actions/all.php:90
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s åŠå¥½å‹"
+msgstr "%1$s 和好å‹ï¼Œç¬¬%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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s åŠå¥½å‹"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "%s 好å‹çš„èšåˆ(RSS 1.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "%s 好å‹çš„èšåˆ(RSS 2.0)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%s 好å‹çš„èšåˆ(Atom)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "这是 %s 和好å‹çš„时间线,但是没有任何人å‘布内容。"
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -172,14 +172,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,66 +187,65 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
-#, fuzzy
+#: actions/all.php:182
msgid "You and friends"
-msgstr "%s åŠå¥½å‹"
+msgstr "你和好å‹"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 方法未实现ï¼"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr "此方法接å—POST请求。"
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "无法更新用户。"
@@ -268,7 +267,7 @@ msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -328,43 +327,43 @@ msgstr "å‘ç»™ %s 的直接消æ¯"
msgid "All the direct messages sent to %s"
msgstr "å‘ç»™ %s 的直接消æ¯"
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr "消æ¯æ²¡æœ‰æ­£æ–‡ï¼"
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, fuzzy, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个字符。"
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr "未找到收件人。"
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr "无法å‘并éžå¥½å‹çš„用户å‘é€ç›´æŽ¥æ¶ˆæ¯ã€‚"
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚"
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
#, fuzzy
msgid "This status is already a favorite."
msgstr "已收è—此通告ï¼"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "无法创建收è—。"
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
#, fuzzy
msgid "That status is not a favorite."
msgstr "此通告未被收è—ï¼"
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "无法删除收è—。"
@@ -401,122 +400,122 @@ msgstr "无法获å–收è—的通告。"
msgid "Could not find target user."
msgstr "找ä¸åˆ°ä»»ä½•ä¿¡æ¯ã€‚"
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称åªèƒ½ä½¿ç”¨å°å†™å­—æ¯å’Œæ•°å­—,ä¸åŒ…å«ç©ºæ ¼ã€‚"
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,æ¢ä¸€ä¸ªå§ã€‚"
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "ä¸æ˜¯æœ‰æ•ˆçš„昵称。"
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "主页的URLä¸æ­£ç¡®ã€‚"
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "å…¨å过长(ä¸èƒ½è¶…过 255 个字符)。"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "æ述过长(ä¸èƒ½è¶…过140字符)。"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "ä½ç½®è¿‡é•¿(ä¸èƒ½è¶…过255个字符)。"
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "主页'%s'ä¸æ­£ç¡®"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "昵称已被使用,æ¢ä¸€ä¸ªå§ã€‚"
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "API 方法未实现ï¼"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "无法把 %s 用户添加到 %s 组"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "您未告知此个人信æ¯"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "无法订阅用户:未找到。"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "%s 群组"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%s 组是æˆå‘˜ç»„æˆäº†"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s 群组"
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, fuzzy, php-format
msgid "groups on %s"
msgstr "组动作"
@@ -532,15 +531,15 @@ msgstr "大å°ä¸æ­£ç¡®ã€‚"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -604,12 +603,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
msgid "Account"
msgstr "å¸å·"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -617,8 +616,8 @@ msgid "Nickname"
msgstr "昵称"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "密ç "
@@ -635,11 +634,11 @@ msgstr "全部"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "此方法接å—POST或DELETE请求。"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr "您ä¸èƒ½åˆ é™¤å…¶ä»–用户的状æ€ã€‚"
@@ -658,27 +657,27 @@ msgstr "无法开å¯é€šå‘Šã€‚"
msgid "Already repeated that notice."
msgstr "删除通告"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "头åƒå·²æ›´æ–°ã€‚"
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个字符。"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "未找到"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -688,32 +687,32 @@ msgstr ""
msgid "Unsupported format."
msgstr "ä¸æ”¯æŒè¿™ç§å›¾åƒæ ¼å¼ã€‚"
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s çš„æ”¶è— / %s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 收è—了 %s çš„ %s 通告。"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / å›žå¤ %2$s 的消æ¯"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "å›žå¤ %2$s / %3$s çš„ %1$s 更新。"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "æ¥è‡ªæ‰€æœ‰äººçš„ %s 消æ¯ï¼"
@@ -728,12 +727,12 @@ msgstr "%s 的回å¤"
msgid "Repeats of %s"
msgstr "%s 的回å¤"
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "带 %s 标签的通告"
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上 %1$s çš„æ›´æ–°ï¼"
@@ -792,7 +791,7 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
#, fuzzy
msgid "Delete"
msgstr "删除"
@@ -836,12 +835,12 @@ msgstr "头åƒå·²æ›´æ–°ã€‚"
msgid "You already blocked that user."
msgstr "您已æˆåŠŸé˜»æ­¢è¯¥ç”¨æˆ·ï¼š"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "阻止用户"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -853,7 +852,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -863,7 +862,7 @@ msgstr "å¦"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "å–消阻止次用户"
@@ -873,7 +872,7 @@ msgstr "å–消阻止次用户"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -882,12 +881,12 @@ msgid "Yes"
msgstr "是"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ä¿å­˜é˜»æ­¢ä¿¡æ¯å¤±è´¥ã€‚"
@@ -1022,7 +1021,7 @@ msgstr "您未告知此个人信æ¯"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚"
@@ -1038,6 +1037,8 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"你确定è¦åˆ é™¤è¿™ä¸ªç»„件å—?这将从数æ®åº“中清除有关这个组件的所有数æ®ï¼ŒåŒ…括所有的"
+"用户è”系。"
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
@@ -1057,7 +1058,7 @@ msgstr "删除通告"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "未登录。"
@@ -1088,7 +1089,7 @@ msgid "Do not delete this notice"
msgstr "无法删除通告。"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -1131,51 +1132,60 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "大å°ä¸æ­£ç¡®ã€‚"
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "这个页é¢ä¸æ供您想è¦çš„媒体类型"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "修改密ç "
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "邀请"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "修改"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "新通告"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
#, fuzzy
msgid "Theme for the site."
msgstr "登出本站"
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "新通告"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1183,61 +1193,69 @@ msgid ""
msgstr "ä½ å¯ä»¥ç»™ä½ çš„组上载一个logo图。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "修改密ç "
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "连接"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "æœç´¢"
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr "文本"
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登录"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1247,7 +1265,7 @@ msgstr ""
msgid "Save"
msgstr "ä¿å­˜"
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1539,7 +1557,7 @@ msgid "Cannot normalize that email address"
msgstr "无法识别此电å­é‚®ä»¶"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å­é‚®ä»¶ã€‚"
@@ -1780,14 +1798,14 @@ msgstr "用户没有个人信æ¯ã€‚"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
#, fuzzy
msgid "No profile specified."
msgstr "没有收件人。"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
#, fuzzy
msgid "No profile with that ID."
msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚"
@@ -1937,7 +1955,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr "%s 时间表"
@@ -2353,50 +2371,54 @@ msgstr "您未告知此个人信æ¯"
msgid "%1$s left group %2$s"
msgstr "%s 离开群 %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登录。"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "用户å或密ç ä¸æ­£ç¡®ã€‚"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "未认è¯ã€‚"
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "è®°ä½ç™»å½•çŠ¶æ€"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "ä¿æŒè¿™å°æœºå™¨ä¸Šçš„登录状æ€ã€‚ä¸è¦åœ¨å…±ç”¨çš„机器上ä¿æŒç™»å½•ï¼"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "忘记了密ç ï¼Ÿ"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "由于安全原因,修改设置å‰éœ€è¦è¾“入用户å和密ç ã€‚"
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "输入用户å和密ç ä»¥ç™»å½•ã€‚"
+
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"请使用你的å¸å·å’Œå¯†ç ç™»å…¥ã€‚没有å¸å·ï¼Ÿ[注册](%%action.register%%) 一个新å¸å·, "
"或使用 [OpenID](%%action.openidlogin%%). "
@@ -2601,31 +2623,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "通告没有关è”个人信æ¯"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s çš„ %2$s 状æ€"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "连接"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚"
@@ -2738,7 +2760,7 @@ msgid "6 or more characters"
msgstr "6 个或更多字符"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "确认"
@@ -2750,11 +2772,11 @@ msgstr "相åŒçš„密ç "
msgid "Change"
msgstr "修改"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "密ç å¿…é¡»åŒ…å« 6 个或更多字符。"
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "密ç ä¸åŒ¹é…。"
@@ -2775,7 +2797,7 @@ msgid "Password saved."
msgstr "密ç å·²ä¿å­˜ã€‚"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2990,44 +3012,44 @@ msgstr "未知的å¸å·"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个å°å†™å­—æ¯æˆ–数字,ä¸åŒ…å«æ ‡ç‚¹åŠç©ºç™½"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "å…¨å"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "您的主页ã€åšå®¢æˆ–在其他站点的URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "用ä¸è¶…过140个字符æ述您自己和您的爱好"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "用ä¸è¶…过140个字符æ述您自己和您的爱好"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自述"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "ä½ç½®"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "ä½ çš„ä½ç½®ï¼Œæ ¼å¼ç±»ä¼¼\"城市,çœä»½ï¼Œå›½å®¶\""
@@ -3067,7 +3089,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自动订阅任何订阅我的更新的人(这个选项最适åˆæœºå™¨äºº)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(ä¸èƒ½è¶…过140字符)。"
@@ -3320,7 +3342,7 @@ msgstr "密ç å¿…须是 6 个字符或更多。"
msgid "Password and confirmation do not match."
msgstr "密ç å’Œç¡®è®¤ä¸åŒ¹é…。"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ä¿å­˜ç”¨æˆ·è®¾ç½®æ—¶å‡ºé”™ã€‚"
@@ -3328,79 +3350,101 @@ msgstr "ä¿å­˜ç”¨æˆ·è®¾ç½®æ—¶å‡ºé”™ã€‚"
msgid "New password successfully saved. You are now logged in."
msgstr "新密ç å·²ä¿å­˜ï¼Œæ‚¨çŽ°åœ¨å·²ç™»å½•ã€‚"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "对ä¸èµ·ï¼Œè¯·é‚€è¯·é‚£äº›èƒ½æ³¨å†Œçš„人。"
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "验è¯ç å‡ºé”™ã€‚"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "注册æˆåŠŸã€‚"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "ä¸å…许注册。"
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "您必须åŒæ„此授æƒæ–¹å¯æ³¨å†Œã€‚"
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "电å­é‚®ä»¶åœ°å€å·²å­˜åœ¨ã€‚"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "用户å或密ç ä¸æ­£ç¡®ã€‚"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1 到 64 个å°å†™å­—æ¯æˆ–数字,ä¸åŒ…å«æ ‡ç‚¹åŠç©ºç™½ã€‚此项必填。"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 个或更多字符。此项必填。"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "相åŒçš„密ç ã€‚此项必填。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "电å­é‚®ä»¶"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "åªç”¨äºŽæ›´æ–°ã€é€šå‘Šæˆ–密ç æ¢å¤"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "é•¿å字,最好是“实åâ€"
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "除了éšç§å†…容:密ç ï¼Œç”µå­é‚®ä»¶ï¼Œå³æ—¶é€šè®¯å¸å·ï¼Œç”µè¯å·ç ã€‚"
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3431,7 +3475,7 @@ msgstr ""
"\n"
"感谢您的注册,希望您喜欢这个æœåŠ¡ã€‚"
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3517,7 +3561,7 @@ msgstr "您必须åŒæ„此授æƒæ–¹å¯æ³¨å†Œã€‚"
msgid "You already repeated that notice."
msgstr "您已æˆåŠŸé˜»æ­¢è¯¥ç”¨æˆ·ï¼š"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "创建"
@@ -3589,7 +3633,7 @@ msgstr "无法å‘此用户å‘é€æ¶ˆæ¯ã€‚"
msgid "User doesn't have this role."
msgstr "找ä¸åˆ°åŒ¹é…的用户。"
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "头åƒå·²æ›´æ–°ã€‚"
@@ -3606,7 +3650,7 @@ msgstr "用户没有个人信æ¯ã€‚"
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3652,7 +3696,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3665,7 +3709,7 @@ msgid "Organization"
msgstr "分页"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
@@ -4282,7 +4326,7 @@ msgstr "没有输入验è¯ç "
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4644,7 +4688,7 @@ msgstr ""
"请检查详细信æ¯ï¼Œç¡®è®¤å¸Œæœ›è®¢é˜…此用户的通告。如果您刚æ‰æ²¡æœ‰è¦æ±‚订阅任何人的通"
"告,请点击\"å–消\"。"
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
#, fuzzy
msgid "License"
msgstr "注册è¯"
@@ -4773,29 +4817,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%2$s 上 %1$s çš„æ›´æ–°ï¼"
-#: actions/version.php:73
+#: actions/version.php:75
#, fuzzy, php-format
msgid "StatusNet %s"
msgstr "统计"
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4803,7 +4847,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4811,40 +4855,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "个人"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4888,49 +4932,49 @@ msgid "Could not update message with new URI."
msgstr "无法添加新URIçš„ä¿¡æ¯ã€‚"
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "添加标签时数æ®åº“出错:%s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:249
+#: classes/Notice.php:255
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里å‘布了过多的消æ¯ï¼Œè¯·æ·±å‘¼å¸ï¼Œè¿‡å‡ åˆ†é’Ÿå†å‘消æ¯ã€‚"
-#: classes/Notice.php:260
+#: classes/Notice.php:266
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里å‘布了过多的消æ¯ï¼Œè¯·æ·±å‘¼å¸ï¼Œè¿‡å‡ åˆ†é’Ÿå†å‘消æ¯ã€‚"
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被ç¦æ­¢å‘布消æ¯ã€‚"
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5040,133 +5084,133 @@ msgid "Untitled page"
msgstr "无标题页"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr "主站导航"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "个人资料åŠæœ‹å‹å¹´è¡¨"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "无法é‡å®šå‘到æœåŠ¡å™¨ï¼š%s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "连接"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "主站导航"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "admin管ç†å‘˜"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表å•æ¥é‚€è¯·å¥½å‹å’ŒåŒäº‹åŠ å…¥ã€‚"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "登出本站"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建新å¸å·"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "注册"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "登录"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:493
+#: lib/action.php:503
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5174,75 +5218,75 @@ msgstr "æœç´¢"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "新通告"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr "本地显示"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "新通告"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "帮助"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "关于"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "常è§é—®é¢˜FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr "éšç§"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr "æ¥æº"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "è”系人"
-#: lib/action.php:784
+#: lib/action.php:794
#, fuzzy
msgid "Badge"
msgstr "呼å«"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr "StatusNet软件注册è¯"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5252,13 +5296,13 @@ msgstr ""
"broughtbyurl%%)。"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 是一个微åšå®¢æœåŠ¡ã€‚"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5270,57 +5314,57 @@ msgstr ""
"授æƒã€‚"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册è¯"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
#, fuzzy
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:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "ä¹‹å‰ Â»"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5328,11 +5372,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5368,74 +5412,74 @@ msgid "Unable to delete design setting."
msgstr "无法ä¿å­˜ Twitter 设置ï¼"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "电å­é‚®ä»¶åœ°å€ç¡®è®¤"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "邀请"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "个人"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr "用户"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "新通告"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS短信确认"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5571,12 +5615,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
#, fuzzy
msgid "Password changing failed"
msgstr "密ç å·²ä¿å­˜ã€‚"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
#, fuzzy
msgid "Password changing is not allowed"
msgstr "密ç å·²ä¿å­˜ã€‚"
@@ -5669,14 +5713,14 @@ msgstr "å…¨å:%s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "ä½ç½®ï¼š%s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
@@ -6177,8 +6221,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注您的 %2$s ä¿¡æ¯ã€‚"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6199,7 +6250,7 @@ msgstr ""
"为您效力的 %4$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6207,13 +6258,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电å­é‚®ä»¶åœ°å€ï¼Œç”¨äºŽå‘布 %s ä¿¡æ¯"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6234,30 +6285,30 @@ msgstr ""
"为您效力的 %4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s 状æ€"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS短信确认"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "等待确认此电è¯å·ç ã€‚"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 振铃呼å«ä½ "
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6274,13 +6325,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s å‘é€äº†æ–°çš„ç§äººä¿¡æ¯"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6300,13 +6351,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s 收è—了您的通告"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6328,7 +6379,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6336,13 +6387,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6379,7 +6430,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
#, fuzzy
msgid "from"
msgstr " 从 "
@@ -6542,27 +6593,27 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "没有内容ï¼"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "创建"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
#, fuzzy
msgid "Reply to this notice"
msgstr "无法删除通告。"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
#, fuzzy
msgid "Reply"
msgstr "回å¤"
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "消æ¯å·²å‘布。"
@@ -6638,7 +6689,7 @@ msgstr "您å‘é€çš„消æ¯"
msgid "Tags in %s's notices"
msgstr "%s's 的消æ¯çš„标签"
-#: lib/plugin.php:114
+#: lib/plugin.php:115
#, fuzzy
msgid "Unknown"
msgstr "未知动作"
@@ -6678,7 +6729,7 @@ msgstr ""
msgid "All groups"
msgstr "所有组"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6704,7 +6755,7 @@ msgstr "特å¾"
msgid "Popular"
msgstr "用户"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "没有这份文档。"
@@ -6728,7 +6779,7 @@ msgstr "无法删除通告。"
msgid "Revoke the \"%s\" role from this user"
msgstr "该组æˆå‘˜åˆ—表。"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6783,7 +6834,7 @@ msgstr "无标题章节"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "更多..."
#: lib/silenceform.php:67
#, fuzzy
@@ -6834,6 +6885,51 @@ msgstr ""
msgid "None"
msgstr "å¦"
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#, fuzzy
+msgid "Theme upload missing or failed."
+msgstr "上传文件时出错。"
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "更新头åƒå¤±è´¥ã€‚"
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "更新远程的个人信æ¯æ—¶å‡ºé”™"
+
#: lib/topposterssection.php:74
#, fuzzy
msgid "Top posters"
@@ -6892,7 +6988,7 @@ msgstr "个人设置"
#: lib/userprofile.php:264
msgid "Edit"
-msgstr ""
+msgstr "编辑"
#: lib/userprofile.php:287
#, fuzzy
@@ -6925,56 +7021,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "几秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "一分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "一å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "一天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d 天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "一个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d 个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "一年å‰"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 5d8a1c381..e002fd55d 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:50:12+0000\n"
+"POT-Creation-Date: 2010-06-16 22:18+0000\n"
+"PO-Revision-Date: 2010-06-21 18:05:30+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r68367); Translate extension (2010-06-12)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -20,7 +20,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
#, fuzzy
msgid "Access"
msgstr "接å—"
@@ -87,25 +87,25 @@ msgid "Save"
msgstr ""
#. TRANS: Server error when page not found (404)
-#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
#, fuzzy
msgid "No such page."
msgstr "無此通知"
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
-#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:228 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
#: actions/otp.php:76 actions/remotesubscribe.php:145
@@ -118,7 +118,7 @@ msgid "No such user."
msgstr "無此使用者"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:90
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s與好å‹"
@@ -126,39 +126,39 @@ msgstr "%s與好å‹"
#. 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.
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s與好å‹"
#. TRANS: %1$s is user nickname
-#: actions/all.php:103
+#: actions/all.php:107
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "發é€çµ¦%s好å‹çš„訂閱"
#. TRANS: %1$s is user nickname
-#: actions/all.php:112
+#: actions/all.php:116
#, fuzzy, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "發é€çµ¦%s好å‹çš„訂閱"
#. TRANS: %1$s is user nickname
-#: actions/all.php:121
+#: actions/all.php:125
#, fuzzy, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "發é€çµ¦%s好å‹çš„訂閱"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:139
+#: actions/all.php:143
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -166,14 +166,14 @@ msgid ""
msgstr ""
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:142
+#: actions/all.php:146
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -181,66 +181,66 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:182
#, fuzzy
msgid "You and friends"
msgstr "%s與好å‹"
#. 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:120
-#: actions/apitimelinehome.php:121
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
-#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
-#: actions/apigroupshow.php:115 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:152 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "確èªç¢¼éºå¤±"
-#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdatedeliverydevice.php:86
#: actions/apiaccountupdateprofile.php:89
#: actions/apiaccountupdateprofilebackgroundimage.php:86
#: actions/apiaccountupdateprofilecolors.php:110
#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
msgid "This method requires a POST."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:106
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:133
#, fuzzy
msgid "Could not update user."
msgstr "無法更新使用者"
@@ -262,7 +262,7 @@ msgstr "無法儲存個人資料"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:211 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -321,41 +321,41 @@ msgstr ""
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:118
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr ""
-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:138
msgid "Recipient user not found."
msgstr ""
-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:142
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr ""
-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:123
msgid "That status is not a favorite."
msgstr ""
-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr ""
@@ -392,121 +392,121 @@ msgstr "無法更新使用者"
msgid "Could not find target user."
msgstr "無法更新使用者"
-#: actions/apigroupcreate.php:166 actions/editgroup.php:186
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "暱稱請用å°å¯«å­—æ¯æˆ–數字,勿加空格。"
-#: actions/apigroupcreate.php:175 actions/editgroup.php:190
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "此暱稱已有人使用。å†è©¦è©¦çœ‹åˆ¥çš„å§ã€‚"
-#: actions/apigroupcreate.php:182 actions/editgroup.php:193
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr ""
-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "個人首é ä½å€éŒ¯èª¤"
-#: actions/apigroupcreate.php:207 actions/editgroup.php:202
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "å…¨åéŽé•·ï¼ˆæœ€å¤š255字元)"
-#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "自我介紹éŽé•·(å…±140個字元)"
-#: actions/apigroupcreate.php:226 actions/editgroup.php:208
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "地點éŽé•·ï¼ˆå…±255個字)"
-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "個人首é é€£çµ%s無效"
-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "此暱稱已有人使用。å†è©¦è©¦çœ‹åˆ¥çš„å§ã€‚"
-#: actions/apigroupcreate.php:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
#, fuzzy
msgid "Group not found."
msgstr "ç›®å‰ç„¡è«‹æ±‚"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:115
#, fuzzy
msgid "You are not a member of this group."
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:129
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "無法從 %s 建立OpenID"
#. TRANS: %s is a user name
-#: actions/apigrouplist.php:97
+#: actions/apigrouplist.php:98
#, fuzzy, php-format
msgid "%s's groups"
msgstr "無此通知"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108
#, fuzzy, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
#. 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:91 actions/usergroups.php:63
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr ""
-#: actions/apigrouplistall.php:95
+#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
msgstr ""
@@ -522,15 +522,15 @@ msgstr "尺寸錯誤"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
@@ -594,13 +594,13 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:450
#, fuzzy
msgid "Account"
msgstr "關於"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -608,8 +608,8 @@ msgid "Nickname"
msgstr "暱稱"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr ""
@@ -625,11 +625,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
msgstr ""
@@ -648,27 +648,27 @@ msgstr "儲存使用者發生錯誤"
msgid "Already repeated that notice."
msgstr "無此使用者"
-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139
#, fuzzy
msgid "Status deleted."
msgstr "更新個人圖åƒ"
-#: actions/apistatusesshow.php:144
+#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:241 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "ç›®å‰ç„¡è«‹æ±‚"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:305 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -677,32 +677,32 @@ msgstr ""
msgid "Unsupported format."
msgstr ""
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/apitimelinefavorites.php:118
+#: actions/apitimelinefavorites.php:119
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "&s的微型部è½æ ¼"
-#: actions/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/apitimelinementions.php:130
+#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -717,12 +717,12 @@ msgstr ""
msgid "Repeats of %s"
msgstr ""
-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "&s的微型部è½æ ¼"
@@ -781,7 +781,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:648
msgid "Delete"
msgstr ""
@@ -823,12 +823,12 @@ msgstr "更新個人圖åƒ"
msgid "You already blocked that user."
msgstr "無此使用者"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "無此使用者"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -840,7 +840,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -849,7 +849,7 @@ msgstr ""
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "無此使用者"
@@ -859,7 +859,7 @@ msgstr "無此使用者"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -867,12 +867,12 @@ msgid "Yes"
msgstr ""
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "無此使用者"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1007,7 +1007,7 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1253
+#: lib/action.php:1263
msgid "There was a problem with your session token."
msgstr ""
@@ -1041,7 +1041,7 @@ msgstr "請在140個字以內æ述你自己與你的興趣"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr ""
@@ -1071,7 +1071,7 @@ msgid "Do not delete this notice"
msgstr "無此通知"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:648
msgid "Delete this notice"
msgstr ""
@@ -1112,50 +1112,59 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:276
+#: actions/designadminpanel.php:318
#, fuzzy
msgid "Invalid logo URL."
msgstr "尺寸錯誤"
-#: actions/designadminpanel.php:280
+#: actions/designadminpanel.php:322
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "個人首é ä½å€éŒ¯èª¤"
-#: actions/designadminpanel.php:376
+#: actions/designadminpanel.php:426
#, fuzzy
msgid "Change logo"
msgstr "更改密碼"
-#: actions/designadminpanel.php:381
+#: actions/designadminpanel.php:431
#, fuzzy
msgid "Site logo"
msgstr "新訊æ¯"
-#: actions/designadminpanel.php:388
+#: actions/designadminpanel.php:443
#, fuzzy
msgid "Change theme"
msgstr "更改"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:460
#, fuzzy
msgid "Site theme"
msgstr "新訊æ¯"
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:461
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Custom theme"
+msgstr "新訊æ¯"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:428
+#: actions/designadminpanel.php:496
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1163,60 +1172,68 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:476 lib/designsettings.php:155
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:477 lib/designsettings.php:156
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:482 lib/designsettings.php:161
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:491 lib/designsettings.php:170
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "更改密碼"
-#: actions/designadminpanel.php:513 lib/designsettings.php:191
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "連çµ"
-#: actions/designadminpanel.php:526 lib/designsettings.php:204
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:539 lib/designsettings.php:217
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:552 lib/designsettings.php:230
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登入"
-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:581 lib/designsettings.php:248
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:254
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: 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
@@ -1226,7 +1243,7 @@ msgstr ""
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1509,7 +1526,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "此信箱無效"
@@ -1742,13 +1759,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1889,7 +1906,7 @@ msgstr ""
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
#, php-format
msgid "%s timeline"
msgstr ""
@@ -2272,49 +2289,53 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登入"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "使用者å稱或密碼錯誤"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "未來在åŒä¸€éƒ¨é›»è…¦è‡ªå‹•ç™»å…¥"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "éºå¤±æˆ–忘記密碼了嗎?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "為安全起見,請先é‡æ–°è¼¸å…¥ä½ çš„使用者å稱與密碼å†æ›´æ”¹è¨­å®šã€‚"
-#: actions/login.php:270
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "使用者å稱或密碼無效"
+
+#: actions/login.php:295
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2510,31 +2531,31 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
#, fuzzy
msgid "Notice has no profile."
msgstr "無此通知"
-#: actions/oembed.php:86 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s的狀態是%2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:158
+#: actions/oembed.php:159
#, fuzzy, php-format
msgid "Content type %s not supported."
msgstr "連çµ"
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:162
+#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1179
+#: lib/apiaction.php:1208 lib/apiaction.php:1325
msgid "Not a supported data format."
msgstr ""
@@ -2644,7 +2665,7 @@ msgid "6 or more characters"
msgstr "6個以上字元"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "確èª"
@@ -2656,11 +2677,11 @@ msgstr ""
msgid "Change"
msgstr "更改"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr ""
@@ -2681,7 +2702,7 @@ msgid "Password saved."
msgstr ""
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
msgid "Paths"
msgstr ""
@@ -2888,44 +2909,44 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64個å°å¯«è‹±æ–‡å­—æ¯æˆ–數字,勿加標點符號或空格"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "å…¨å"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "個人首é "
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "請在140個字以內æ述你自己與你的興趣"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "請在140個字以內æ述你自己與你的興趣"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自我介紹"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "地點"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2965,7 +2986,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹éŽé•·(å…±140個字元)"
@@ -3212,7 +3233,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "使用者設定發生錯誤"
@@ -3220,79 +3241,101 @@ msgstr "使用者設定發生錯誤"
msgid "New password successfully saved. You are now logged in."
msgstr "新密碼已儲存æˆåŠŸã€‚你已登入。"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "確èªç¢¼ç™¼ç”ŸéŒ¯èª¤"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "此電å­ä¿¡ç®±å·²è¨»å†ŠéŽäº†"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "使用者å稱或密碼無效"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "é›»å­ä¿¡ç®±"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "ä¸åŒ…å«é€™äº›å€‹äººè³‡æ–™ï¼šå¯†ç¢¼ã€é›»å­ä¿¡ç®±ã€ç·šä¸Šå³æ™‚通信箱ã€é›»è©±è™Ÿç¢¼"
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3311,7 +3354,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3389,7 +3432,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "無此使用者"
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:667
#, fuzzy
msgid "Repeated"
msgstr "新增"
@@ -3460,7 +3503,7 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
msgid "User doesn't have this role."
msgstr ""
-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159
#, fuzzy
msgid "StatusNet"
msgstr "更新個人圖åƒ"
@@ -3476,7 +3519,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:391
+#: lib/adminpanelaction.php:392
msgid "Sessions"
msgstr ""
@@ -3520,7 +3563,7 @@ msgid "Icon"
msgstr ""
#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:197
#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
@@ -3533,7 +3576,7 @@ msgid "Organization"
msgstr "地點"
#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:200
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
@@ -4130,7 +4173,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:408
msgid "Snapshots"
msgstr ""
@@ -4479,7 +4522,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4601,29 +4644,29 @@ msgstr ""
#. TRANS: %1$s is a group name, %2$s is a site name.
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
-#: lib/atomusernoticefeed.php:75
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr ""
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
msgstr ""
-#: actions/version.php:153
+#: actions/version.php:155
#, php-format
msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
-#: actions/version.php:161
+#: actions/version.php:163
msgid "Contributors"
msgstr ""
-#: actions/version.php:168
+#: actions/version.php:170
msgid ""
"StatusNet is free software: you can redistribute it and/or modify it under "
"the terms of the GNU Affero General Public License as published by the Free "
@@ -4631,7 +4674,7 @@ msgid ""
"any later version. "
msgstr ""
-#: actions/version.php:174
+#: actions/version.php:176
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4639,40 +4682,40 @@ msgid ""
"for more details. "
msgstr ""
-#: actions/version.php:180
+#: actions/version.php:182
#, php-format
msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
-#: actions/version.php:189
+#: actions/version.php:191
msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:789
#, fuzzy
msgid "Version"
msgstr "地點"
-#: actions/version.php:197
+#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/File.php:169
+#: classes/File.php:185
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:179
+#: classes/File.php:195
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:186
+#: classes/File.php:202
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4715,48 +4758,48 @@ msgid "Could not update message with new URI."
msgstr ""
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:176
+#: classes/Notice.php:182
#, fuzzy, php-format
msgid "Database error inserting hashtag: %s"
msgstr "增加回覆時,資料庫發生錯誤: %s"
-#: classes/Notice.php:245
+#: classes/Notice.php:251
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:249
+#: classes/Notice.php:255
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:254
+#: classes/Notice.php:260
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:260
+#: classes/Notice.php:266
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:266
+#: classes/Notice.php:272
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:332 classes/Notice.php:358
+#: classes/Notice.php:338 classes/Notice.php:364
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:973
#, fuzzy
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:1513
+#: classes/Notice.php:1564
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4866,201 +4909,201 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:426
+#: lib/action.php:436
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:432
+#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:435
+#: lib/action.php:445
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "地點"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:437
+#: lib/action.php:447
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "更改密碼"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:442
+#: lib/action.php:452
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:445
+#: lib/action.php:455
msgid "Connect"
msgstr "連çµ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:448
+#: lib/action.php:458
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:451
+#: lib/action.php:461
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:455
+#: lib/action.php:465
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:458
+#: lib/action.php:468
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "尺寸錯誤"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:464
+#: lib/action.php:474
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:467
+#: lib/action.php:477
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:472
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "新增帳號"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:475
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "所有訂閱"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:478
+#: lib/action.php:488
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:481
+#: lib/action.php:491
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "登入"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:484
+#: lib/action.php:494
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:487
+#: lib/action.php:497
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "求救"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:490
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:493
+#: lib/action.php:503
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:525 lib/adminpanelaction.php:400
#, fuzzy
msgid "Site notice"
msgstr "新訊æ¯"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:582
+#: lib/action.php:592
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:649
+#: lib/action.php:659
#, fuzzy
msgid "Page notice"
msgstr "新訊æ¯"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:752
+#: lib/action.php:762
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:758
+#: lib/action.php:768
msgid "Help"
msgstr "求救"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:761
+#: lib/action.php:771
msgid "About"
msgstr "關於"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:764
+#: lib/action.php:774
msgid "FAQ"
msgstr "常見å•é¡Œ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:769
+#: lib/action.php:779
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:773
+#: lib/action.php:783
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:776
+#: lib/action.php:786
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:782
+#: lib/action.php:792
msgid "Contact"
msgstr "好å‹åå–®"
-#: lib/action.php:784
+#: lib/action.php:794
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:813
+#: lib/action.php:823
msgid "StatusNet software license"
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:817
+#: lib/action.php:827
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5070,13 +5113,13 @@ msgstr ""
"部è½æ ¼æœå‹™"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:820
+#: lib/action.php:830
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%**是個微型部è½æ ¼"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:824
+#: lib/action.php:834
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5085,56 +5128,56 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:840
+#: lib/action.php:850
#, fuzzy
msgid "Site content license"
msgstr "新訊æ¯"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:847
+#: lib/action.php:857
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:854
+#: lib/action.php:864
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:858
+#: lib/action.php:868
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer. %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:871
+#: lib/action.php:881
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1182
+#: lib/action.php:1192
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:1193
+#: lib/action.php:1203
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:1203
+#: lib/action.php:1213
#, fuzzy
msgid "Before"
msgstr "之å‰çš„內容»"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:121
+#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
@@ -5142,11 +5185,11 @@ msgstr ""
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activityutils.php:236
+#: lib/activityutils.php:244
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activityutils.php:240
+#: lib/activityutils.php:248
msgid "Can't handle embedded Base64 content yet."
msgstr ""
@@ -5177,74 +5220,74 @@ msgid "Unable to delete design setting."
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:350
#, fuzzy
msgid "Basic site configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:352
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "新訊æ¯"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:358
#, fuzzy
msgid "Design configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:359
+#: lib/adminpanelaction.php:360
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "地點"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:366
#, fuzzy
msgid "User configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:374
#, fuzzy
msgid "Access configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:382
#, fuzzy
msgid "Paths configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:390
#, fuzzy
msgid "Sessions configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:398
#, fuzzy
msgid "Edit site notice"
msgstr "新訊æ¯"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:406
#, fuzzy
msgid "Snapshots configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5375,11 +5418,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
msgid "Password changing failed"
msgstr ""
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr ""
@@ -5472,14 +5515,14 @@ msgstr "å…¨å"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5969,8 +6012,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "ç¾åœ¨%1$s在%2$sæˆç‚ºä½ çš„粉絲囉"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5993,19 +6043,19 @@ msgstr ""
"敬上。\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "自我介紹"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6019,30 +6069,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6059,13 +6109,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6085,13 +6135,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "ç¾åœ¨%1$s在%2$sæˆç‚ºä½ çš„粉絲囉"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6113,7 +6163,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6121,13 +6171,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6164,7 +6214,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr ""
@@ -6323,25 +6373,25 @@ msgstr ""
msgid "at"
msgstr ""
-#: lib/noticelist.php:567
+#: lib/noticelist.php:559
#, fuzzy
msgid "in context"
msgstr "無內容"
-#: lib/noticelist.php:602
+#: lib/noticelist.php:594
#, fuzzy
msgid "Repeated by"
msgstr "新增"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:621
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:622
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:674
+#: lib/noticelist.php:666
#, fuzzy
msgid "Notice repeated"
msgstr "更新個人圖åƒ"
@@ -6416,7 +6466,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/plugin.php:114
+#: lib/plugin.php:115
msgid "Unknown"
msgstr ""
@@ -6454,7 +6504,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6478,7 +6528,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "無此文件"
@@ -6502,7 +6552,7 @@ msgstr "無此通知"
msgid "Revoke the \"%s\" role from this user"
msgstr "無此使用者"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6603,6 +6653,50 @@ msgstr ""
msgid "None"
msgstr ""
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "Theme upload missing or failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "無法上傳個人圖åƒ"
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "æ›´æ–°é ç«¯å€‹äººè³‡æ–™ç™¼ç”ŸéŒ¯èª¤"
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
@@ -6688,56 +6782,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 3855d1fb0..30da1dbc7 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -126,6 +126,11 @@ class AimPlugin extends ImPlugin
return true;
}
+ /**
+ * Accept a queued input message.
+ *
+ * @return true if processing completed, false if message should be reprocessed
+ */
function receive_raw_message($message)
{
$info=Aim::getMessageInfo($message);
@@ -133,7 +138,9 @@ class AimPlugin extends ImPlugin
$user = $this->get_user($from);
$notice_text = $info['message'];
- return $this->handle_incoming($from, $notice_text);
+ $this->handle_incoming($from, $notice_text);
+
+ return true;
}
function initialize(){
diff --git a/plugins/Aim/README b/plugins/Aim/README
index 046591738..7d486a036 100644
--- a/plugins/Aim/README
+++ b/plugins/Aim/README
@@ -6,7 +6,7 @@ add "addPlugin('aim',
array('setting'=>'value', 'setting2'=>'value2', ...);"
to the bottom of your config.php
-The daemon included with this plugin must be running. It will be started by
+scripts/imdaemon.php included with StatusNet must be running. It will be started by
the plugin along with their other daemons when you run scripts/startdaemons.sh.
See the StatusNet README for more about queuing and daemons.
diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot
new file mode 100644
index 000000000..b01f9dc89
--- /dev/null
+++ b/plugins/AutoSandbox/locale/AutoSandbox.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AutoSandboxPlugin.php:66
+msgid "Automatically sandboxes newly registered members."
+msgstr ""
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index d586631a4..b2be365dd 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -22,7 +22,8 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2010 Free Software Foundation http://fsf.org
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -31,8 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
-
class AutocompletePlugin extends Plugin
{
function __construct()
@@ -40,6 +39,16 @@ class AutocompletePlugin extends Plugin
parent::__construct();
}
+ function onAutoload($cls)
+ {
+ switch ($cls)
+ {
+ case 'AutocompleteAction':
+ require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
+ return false;
+ }
+ }
+
function onEndShowScripts($action){
if (common_logged_in()) {
$action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index 379390ffd..9a30ba01d 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -23,6 +23,7 @@
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot
new file mode 100644
index 000000000..c0274af85
--- /dev/null
+++ b/plugins/Autocomplete/locale/Autocomplete.pot
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AutocompletePlugin.php:79
+msgid ""
+"The autocomplete plugin allows users to autocomplete screen names in @ "
+"replies. When an \"@\" is typed into the notice text area, an autocomplete "
+"box is displayed populated with the user's friend' screen names."
+msgstr ""
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index b649d3d0b..38c821636 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot
new file mode 100644
index 000000000..28023759a
--- /dev/null
+++ b/plugins/BitlyUrl/locale/BitlyUrl.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: BitlyUrlPlugin.php:60
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index adc4d9d7e..63bffe2c6 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -262,7 +262,7 @@ class BlacklistPlugin extends Plugin
$patterns = $this->_getUrlPatterns();
foreach ($patterns as $pattern) {
- if (preg_match("/$pattern/", $url)) {
+ if ($pattern != '' && preg_match("/$pattern/", $url)) {
return false;
}
}
@@ -285,7 +285,7 @@ class BlacklistPlugin extends Plugin
$patterns = $this->_getNicknamePatterns();
foreach ($patterns as $pattern) {
- if (preg_match("/$pattern/", $nickname)) {
+ if ($pattern != '' && preg_match("/$pattern/", $nickname)) {
return false;
}
}
diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php
index 32080667e..ec89ee4bd 100644
--- a/plugins/Blacklist/Homepage_blacklist.php
+++ b/plugins/Blacklist/Homepage_blacklist.php
@@ -94,7 +94,7 @@ class Homepage_blacklist extends Memcached_DataObject
function keys()
{
- return array('pattern' => 'K');
+ return array_keys($this->keyTypes());
}
/**
@@ -108,7 +108,7 @@ class Homepage_blacklist extends Memcached_DataObject
function keyTypes()
{
- return $this->keys();
+ return array('pattern' => 'K');
}
/**
diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php
index 981063144..e8545292d 100644
--- a/plugins/Blacklist/Nickname_blacklist.php
+++ b/plugins/Blacklist/Nickname_blacklist.php
@@ -88,7 +88,7 @@ class Nickname_blacklist extends Memcached_DataObject
function keys()
{
- return array('pattern' => 'K');
+ return array_keys($this->keyTypes());
}
/**
@@ -99,7 +99,7 @@ class Nickname_blacklist extends Memcached_DataObject
function keyTypes()
{
- return $this->keys();
+ return array('pattern' => 'K');
}
/**
diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php
index b996aba8d..4289dec1b 100644
--- a/plugins/Blacklist/blacklistadminpanel.php
+++ b/plugins/Blacklist/blacklistadminpanel.php
@@ -88,28 +88,27 @@ class BlacklistadminpanelAction extends AdminPanelAction
function saveSettings()
{
- $nickPatterns = array();
-
- $rawNickPatterns = explode("\n", $this->trimmed('blacklist-nicknames'));
-
- foreach ($rawNickPatterns as $raw) {
- $nickPatterns[] = trim($raw);
- }
-
+ $nickPatterns = $this->splitPatterns($this->trimmed('blacklist-nicknames'));
Nickname_blacklist::saveNew($nickPatterns);
- $rawUrlPatterns = explode("\n", $this->trimmed('blacklist-urls'));
- $urlPatterns = array();
-
- foreach ($rawUrlPatterns as $raw) {
- $urlPatterns[] = trim($raw);
- }
-
+ $urlPatterns = $this->splitPatterns($this->trimmed('blacklist-urls'));
Homepage_blacklist::saveNew($urlPatterns);
return;
}
+ protected function splitPatterns($text)
+ {
+ $patterns = array();
+ foreach (explode("\n", $text) as $raw) {
+ $trimmed = trim($raw);
+ if ($trimmed != '') {
+ $patterns[] = $trimmed;
+ }
+ }
+ return $patterns;
+ }
+
/**
* Validate the values
*
diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
new file mode 100644
index 000000000..90eda0941
--- /dev/null
+++ b/plugins/Blacklist/locale/Blacklist.pot
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: BlacklistPlugin.php:153
+#, php-format
+msgid "You may not register with homepage '%s'"
+msgstr ""
+
+#: BlacklistPlugin.php:163
+#, php-format
+msgid "You may not register with nickname '%s'"
+msgstr ""
+
+#: BlacklistPlugin.php:188
+#, php-format
+msgid "You may not use homepage '%s'"
+msgstr ""
+
+#: BlacklistPlugin.php:198
+#, php-format
+msgid "You may not use nickname '%s'"
+msgstr ""
+
+#: BlacklistPlugin.php:242
+#, php-format
+msgid "You may not use url '%s' in notices"
+msgstr ""
+
+#: BlacklistPlugin.php:351
+msgid "Keep a blacklist of forbidden nickname and URL patterns."
+msgstr ""
+
+#: blacklistadminpanel.php:185
+msgid "Nicknames"
+msgstr ""
+
+#: blacklistadminpanel.php:193
+msgid "URLs"
+msgstr ""
diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php
index 203e5fe42..1662db3eb 100644
--- a/plugins/CasAuthentication/CasAuthenticationPlugin.php
+++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot
new file mode 100644
index 000000000..20a2bf233
--- /dev/null
+++ b/plugins/CasAuthentication/locale/CasAuthentication.pot
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: CasAuthenticationPlugin.php:82
+msgid "CAS"
+msgstr ""
+
+#: CasAuthenticationPlugin.php:83
+msgid "Login or register with CAS"
+msgstr ""
+
+#: CasAuthenticationPlugin.php:150
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+
+#: caslogin.php:28
+msgid "Already logged in."
+msgstr ""
diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
new file mode 100644
index 000000000..3da08e05d
--- /dev/null
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to enable client side url shortening in the status box
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php');
+
+class ClientSideShortenPlugin extends Plugin
+{
+ function __construct()
+ {
+ parent::__construct();
+ }
+
+ function onAutoload($cls)
+ {
+ switch ($cls)
+ {
+ case 'ShortenAction':
+ require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php');
+ return false;
+ }
+ }
+
+ function onEndShowScripts($action){
+ if (common_logged_in()) {
+ $user = common_current_user();
+ $action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user));
+ $action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user));
+ $action->script('plugins/ClientSideShorten/shorten.js');
+ }
+ }
+
+ function onRouterInitialized($m)
+ {
+ if (common_logged_in()) {
+ $m->connect('plugins/ClientSideShorten/shorten', array('action'=>'shorten'));
+ }
+ }
+
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'Shorten',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Craig Andrews',
+ 'homepage' => 'http://status.net/wiki/Plugin:ClientSideShorten',
+ 'rawdescription' =>
+ _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten urls as they entered, and before the notice is submitted.'));
+ return true;
+ }
+
+}
+
diff --git a/plugins/ClientSideShorten/README b/plugins/ClientSideShorten/README
new file mode 100644
index 000000000..e6524c9c7
--- /dev/null
+++ b/plugins/ClientSideShorten/README
@@ -0,0 +1,6 @@
+ClientSideShorten causes the web interface's notice form to automatically shorten urls as they entered, and before the notice is submitted.
+
+Installation
+============
+Add "addPlugin('ClientSideShorten');" to the bottom of your config.php
+That's it!
diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
new file mode 100644
index 000000000..83caff322
--- /dev/null
+++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ClientSideShortenPlugin.php:74
+msgid ""
+"ClientSideShorten causes the web interface's notice form to automatically "
+"shorten urls as they entered, and before the notice is submitted."
+msgstr ""
+
+#: shorten.php:55
+msgid "'text' argument must be specified."
+msgstr ""
diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js
new file mode 100644
index 000000000..bdffb81e2
--- /dev/null
+++ b/plugins/ClientSideShorten/shorten.js
@@ -0,0 +1,77 @@
+//wrap everything in a self-executing anonymous function to avoid conflicts
+(function(){
+
+ // smart(x) from Paul Irish
+ // http://paulirish.com/2009/throttled-smartresize-jquery-event-handler/
+
+ (function($,sr){
+
+ // debouncing function from John Hann
+ // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
+ var debounce = function (func, threshold, execAsap) {
+ var timeout;
+
+ return function debounced () {
+ var obj = this, args = arguments;
+ function delayed () {
+ if (!execAsap)
+ func.apply(obj, args);
+ timeout = null;
+ };
+
+ if (timeout)
+ clearTimeout(timeout);
+ else if (execAsap)
+ func.apply(obj, args);
+
+ timeout = setTimeout(delayed, threshold || 100);
+ };
+ }
+ jQuery.fn[sr] = function(fn){ return fn ? this.bind('keypress', debounce(fn, 1000)) : this.trigger(sr); };
+
+ })(jQuery,'smartkeypress');
+
+ function longestWordInString(string)
+ {
+ var words = string.split(/\s/);
+ var longestWord = 0;
+ for(var i=0;i<words.length;i++)
+ if(words[i].length > longestWord) longestWord = words[i].length;
+ return longestWord;
+ }
+
+ function shorten()
+ {
+ var $noticeDataText = $('#'+SN.C.S.NoticeDataText);
+ var noticeText = $noticeDataText.val();
+
+ if(noticeText.length > maxNoticeLength || longestWordInString(noticeText) > maxUrlLength) {
+ var original = $noticeDataText.val();
+ shortenAjax = $.ajax({
+ url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',
+ data: { text: $noticeDataText.val() },
+ dataType: 'text',
+ success: function(data) {
+ if(original == $noticeDataText.val()) {
+ $noticeDataText.val(data).keyup();
+ }
+ }
+ });
+ }
+ }
+
+ $(document).ready(function(){
+ $noticeDataText = $('#'+SN.C.S.NoticeDataText);
+ $noticeDataText.smartkeypress(function(e){
+ //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
+ if(e.charCode == '32') {
+ shorten();
+ }
+ });
+ $noticeDataText.bind('paste', function() {
+ //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
+ setTimeout(shorten,1);
+ });
+ });
+
+})();
diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php
new file mode 100644
index 000000000..f67cbf3b2
--- /dev/null
+++ b/plugins/ClientSideShorten/shorten.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List users for autocompletion
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+/**
+ * Shorten all URLs in a string
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class ShortenAction extends Action
+{
+ private $text;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+ $this->groups=array();
+ $this->users=array();
+ $this->text = $this->arg('text');
+ if(is_null($this->text)){
+ throw new ClientException(_m('\'text\' argument must be specified.'));
+ }
+ return true;
+ }
+
+ function handle($args)
+ {
+ parent::handle($args);
+ header('Content-Type: text/plain');
+ $shortened_text = common_shorten_links($this->text);
+ print $shortened_text;
+ }
+}
+
diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php
index 303e60d5f..b1362b166 100644
--- a/plugins/DirectionDetector/DirectionDetectorPlugin.php
+++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php
@@ -1,5 +1,4 @@
<?php
-
/**
* DirectionDetector plugin, detects notices with RTL content & sets RTL
* style for them.
@@ -29,7 +28,7 @@ if (!defined('STATUSNET')) {
exit(1);
}
-define('DIRECTIONDETECTORPLUGIN_VERSION', '0.1.1');
+define('DIRECTIONDETECTORPLUGIN_VERSION', '0.1.2');
class DirectionDetectorPlugin extends Plugin {
/**
@@ -38,7 +37,7 @@ class DirectionDetectorPlugin extends Plugin {
* @param object $notice notice is going to be saved
*/
public function onStartNoticeSave(&$notice){
- if(self::isRTL($notice->content))
+ if(!preg_match('/<span class="rtl">/', $notice->rendered) && self::isRTL($notice->content))
$notice->rendered = '<span class="rtl">'.$notice->rendered.'</span>';
return true;
}
@@ -46,15 +45,15 @@ class DirectionDetectorPlugin extends Plugin {
/**
* SN plugin API, here we will add css needed for modifiyed rendered
*
- * @param
+ * @param
*/
- public function onEndShowStatusNetStyles(&$xml){
+ public function onEndShowStatusNetStyles($xml){
$xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}');
}
/**
* checks that passed string is a RTL language or not
*
- * @param string $str string to be checked
+ * @param string $str String to be checked
*/
public static function isRTL($str){
self::getClearText($str);
@@ -62,15 +61,15 @@ class DirectionDetectorPlugin extends Plugin {
$cc = $cc[0];
else
return false;
- if($cc>=1536 && $cc<=1791) // arabic, persian, urdu, kurdish, ...
+ if($cc>=1536 && $cc<=1791) // Arabic, Persian, Urdu, Kurdish, ...
return true;
- if($cc>=65136 && $cc<=65279) // arabic peresent 2
+ if($cc>=65136 && $cc<=65279) // Arabic peresent 2
return true;
- if($cc>=64336 && $cc<=65023) // arabic peresent 1
+ if($cc>=64336 && $cc<=65023) // Arabic peresent 1
return true;
- if($cc>=1424 && $cc<=1535) // hebrew
+ if($cc>=1424 && $cc<=1535) // Hebrew
return true;
- if($cc>=64256 && $cc<=64335) // hebrew peresent
+ if($cc>=64256 && $cc<=64335) // Hebrew peresent
return true;
if($cc>=1792 && $cc<=1871) // Syriac
return true;
@@ -84,7 +83,7 @@ class DirectionDetectorPlugin extends Plugin {
}
/**
- * clears text from replys, tags, groups, reteets & whitespaces
+ * clears text from replies, tags, groups, repeats & whitespaces
*
* @param string &$str string to be cleared
*/
@@ -95,14 +94,14 @@ class DirectionDetectorPlugin extends Plugin {
}
/**
- * Takes an UTF-8 string and returns an array of ints representing the
- * Unicode characters. Astral planes are supported ie. the ints in the
- * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates
+ * Takes a UTF-8 string and returns an array of ints representing the
+ * Unicode characters. Astral planes are supported i.e. the ints in the
+ * output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
* are not allowed. ### modified ### returns first character code
*
* Returns false if the input string isn't a valid UTF-8 octet sequence.
*/
- private static function utf8ToUnicode(&$str){
+ private static function utf8ToUnicode($str){
$mState = 0; // cached expected number of octets after the current octet
// until the beginning of the next UTF8 character sequence
$mUcs4 = 0; // cached Unicode character
@@ -200,7 +199,7 @@ class DirectionDetectorPlugin extends Plugin {
}
} else {
/* ((0xC0 & (*in) != 0x80) && (mState != 0))
- *
+ *
* Incomplete multi-octet sequence.
*/
return false;
@@ -217,8 +216,9 @@ class DirectionDetectorPlugin extends Plugin {
$versions[] = array(
'name' => 'Direction detector',
'version' => DIRECTIONDETECTORPLUGIN_VERSION,
- 'author' => 'behrooz shabani',
- 'rawdescription' => _m('shows notices with right-to-left content in correct direction.')
+ 'author' => 'Behrooz Shabani',
+ // TRANS: Direction detector plugin description.
+ 'rawdescription' => _m('Shows notices with right-to-left content in correct direction.')
);
return true;
}
diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot
new file mode 100644
index 000000000..44bbcca4d
--- /dev/null
+++ b/plugins/DirectionDetector/locale/DirectionDetector.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-08 22:32+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: DirectionDetectorPlugin.php:222
+msgid "Shows notices with right-to-left content in correct direction."
+msgstr ""
diff --git a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
new file mode 100644
index 000000000..e8dae6ea8
--- /dev/null
+++ b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
@@ -0,0 +1,22 @@
+# Translation of StatusNet plugin DirectionDetector to Dutch
+#
+# Author@translatewiki.net: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-08 22:32+0000\n"
+"PO-Revision-Date: 2010-05-08 23:32+0100\n"
+"Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
+"Language-Team: Dutch\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: DirectionDetectorPlugin.php:222
+msgid "Geeft mededelingen met rechts-naar-linksinhoud weer in de juiste richting."
+msgstr ""
diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
index 406c00073..4c018537b 100644
--- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
+++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
new file mode 100644
index 000000000..d945e2537
--- /dev/null
+++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: EmailAuthenticationPlugin.php:61
+msgid ""
+"The Email Authentication plugin allows users to login using their email "
+"address."
+msgstr ""
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 5dba73a5d..19989a952 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -585,7 +585,7 @@ class FacebookPlugin extends Plugin
function onStartEnqueueNotice($notice, &$transports)
{
- if (self::hasKeys()) {
+ if (self::hasKeys() && $notice->isLocal()) {
array_push($transports, 'facebook');
}
return true;
diff --git a/plugins/Facebook/README b/plugins/Facebook/README
index 14c1d3241..532f1d82e 100644
--- a/plugins/Facebook/README
+++ b/plugins/Facebook/README
@@ -38,11 +38,11 @@ editor or write them down.
In Facebook's application editor, specify the following URLs for your app:
-- Canvas Callback URL : http://example.net/mublog/facebook/app/
-- Post-Remove Callback URL: http://example.net/mublog/facebook/app/remove
-- Post-Add Redirect URL : http://apps.facebook.com/yourapp/
-- Canvas Page URL : http://apps.facebook.com/yourapp/
-- Connect URL : http://example.net/mublog/
+- Canvas Callback URL : http://example.net/mublog/facebook/app/
+- Post-Remove Callback URL : http://example.net/mublog/facebook/app/remove
+- Post-Authorize Redirect URL : http://apps.facebook.com/yourapp/
+- Canvas Page URL : http://apps.facebook.com/yourapp/
+- Connect URL : http://example.net/mublog/
*** ATTENTION ***
These URLs have changed slightly since StatusNet version 0.8.1,
diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php
index 440706cbc..76696c1d5 100644
--- a/plugins/Facebook/facebook/facebook.php
+++ b/plugins/Facebook/facebook/facebook.php
@@ -45,7 +45,9 @@ class Facebook {
public $user;
public $profile_user;
public $canvas_user;
+ public $ext_perms = array();
protected $base_domain;
+
/*
* Create a Facebook client like this:
*
@@ -104,17 +106,17 @@ class Facebook {
*
* For nitty-gritty details of when each of these is used, check out
* http://wiki.developers.facebook.com/index.php/Verifying_The_Signature
- *
- * @param bool resolve_auth_token convert an auth token into a session
*/
- public function validate_fb_params($resolve_auth_token=true) {
+ public function validate_fb_params() {
$this->fb_params = $this->get_valid_fb_params($_POST, 48 * 3600, 'fb_sig');
// note that with preload FQL, it's possible to receive POST params in
// addition to GET, so use a different prefix to differentiate them
if (!$this->fb_params) {
$fb_params = $this->get_valid_fb_params($_GET, 48 * 3600, 'fb_sig');
- $fb_post_params = $this->get_valid_fb_params($_POST, 48 * 3600, 'fb_post_sig');
+ $fb_post_params = $this->get_valid_fb_params($_POST,
+ 48 * 3600, // 48 hours
+ 'fb_post_sig');
$this->fb_params = array_merge($fb_params, $fb_post_params);
}
@@ -128,6 +130,9 @@ class Facebook {
$this->fb_params['canvas_user'] : null;
$this->base_domain = isset($this->fb_params['base_domain']) ?
$this->fb_params['base_domain'] : null;
+ $this->ext_perms = isset($this->fb_params['ext_perms']) ?
+ explode(',', $this->fb_params['ext_perms'])
+ : array();
if (isset($this->fb_params['session_key'])) {
$session_key = $this->fb_params['session_key'];
@@ -141,13 +146,11 @@ class Facebook {
$this->set_user($user,
$session_key,
$expires);
- }
- // if no Facebook parameters were found in the GET or POST variables,
- // then fall back to cookies, which may have cached user information
- // Cookies are also used to receive session data via the Javascript API
- else if ($cookies =
- $this->get_valid_fb_params($_COOKIE, null, $this->api_key)) {
-
+ } else if ($cookies =
+ $this->get_valid_fb_params($_COOKIE, null, $this->api_key)) {
+ // if no Facebook parameters were found in the GET or POST variables,
+ // then fall back to cookies, which may have cached user information
+ // Cookies are also used to receive session data via the Javascript API
$base_domain_cookie = 'base_domain_' . $this->api_key;
if (isset($_COOKIE[$base_domain_cookie])) {
$this->base_domain = $_COOKIE[$base_domain_cookie];
@@ -160,25 +163,6 @@ class Facebook {
$cookies['session_key'],
$expires);
}
- // finally, if we received no parameters, but the 'auth_token' GET var
- // is present, then we are in the middle of auth handshake,
- // so go ahead and create the session
- else if ($resolve_auth_token && isset($_GET['auth_token']) &&
- $session = $this->do_get_session($_GET['auth_token'])) {
- if ($this->generate_session_secret &&
- !empty($session['secret'])) {
- $session_secret = $session['secret'];
- }
-
- if (isset($session['base_domain'])) {
- $this->base_domain = $session['base_domain'];
- }
-
- $this->set_user($session['uid'],
- $session['session_key'],
- $session['expires'],
- isset($session_secret) ? $session_secret : null);
- }
return !empty($this->fb_params);
}
@@ -309,11 +293,28 @@ class Facebook {
// require_add and require_install have been removed.
// see http://developer.facebook.com/news.php?blog=1&story=116 for more details
- public function require_login() {
- if ($user = $this->get_loggedin_user()) {
+ public function require_login($required_permissions = '') {
+ $user = $this->get_loggedin_user();
+ $has_permissions = true;
+
+ if ($required_permissions) {
+ $this->require_frame();
+ $permissions = array_map('trim', explode(',', $required_permissions));
+ foreach ($permissions as $permission) {
+ if (!in_array($permission, $this->ext_perms)) {
+ $has_permissions = false;
+ break;
+ }
+ }
+ }
+
+ if ($user && $has_permissions) {
return $user;
}
- $this->redirect($this->get_login_url(self::current_url(), $this->in_frame()));
+
+ $this->redirect(
+ $this->get_login_url(self::current_url(), $this->in_frame(),
+ $required_permissions));
}
public function require_frame() {
@@ -342,10 +343,11 @@ class Facebook {
return $page . '?' . http_build_query($params);
}
- public function get_login_url($next, $canvas) {
+ public function get_login_url($next, $canvas, $req_perms = '') {
$page = self::get_facebook_url().'/login.php';
- $params = array('api_key' => $this->api_key,
- 'v' => '1.0');
+ $params = array('api_key' => $this->api_key,
+ 'v' => '1.0',
+ 'req_perms' => $req_perms);
if ($next) {
$params['next'] = $next;
diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
index fa1088cd0..e249a326b 100755
--- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php
+++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
@@ -569,7 +569,7 @@ function toggleDisplay(id, type) {
return $this->call_method('facebook.events.invite',
array('eid' => $eid,
'uids' => $uids,
- 'personal_message', $personal_message));
+ 'personal_message' => $personal_message));
}
/**
@@ -1350,53 +1350,6 @@ function toggleDisplay(id, type) {
);
}
- /**
- * Dashboard API
- */
-
- /**
- * Set the news for the specified user.
- *
- * @param int $uid The user for whom you are setting news for
- * @param string $news Text of news to display
- *
- * @return bool Success
- */
- public function dashboard_setNews($uid, $news) {
- return $this->call_method('facebook.dashboard.setNews',
- array('uid' => $uid,
- 'news' => $news)
- );
- }
-
- /**
- * Get the current news of the specified user.
- *
- * @param int $uid The user to get the news of
- *
- * @return string The text of the current news for the user
- */
- public function dashboard_getNews($uid) {
- return json_decode(
- $this->call_method('facebook.dashboard.getNews',
- array('uid' => $uid)
- ), true);
- }
-
- /**
- * Set the news for the specified user.
- *
- * @param int $uid The user you are clearing the news of
- *
- * @return bool Success
- */
- public function dashboard_clearNews($uid) {
- return $this->call_method('facebook.dashboard.clearNews',
- array('uid' => $uid)
- );
- }
-
-
/**
* Creates a note with the specified title and content.
@@ -2005,7 +1958,7 @@ function toggleDisplay(id, type) {
* @return array A list of strings describing any compile errors for the
* submitted FBML
*/
- function profile_setFBML($markup,
+ public function profile_setFBML($markup,
$uid=null,
$profile='',
$profile_action='',
@@ -3267,9 +3220,8 @@ function toggleDisplay(id, type) {
} else {
$get['v'] = '1.0';
}
- if (isset($this->use_ssl_resources) &&
- $this->use_ssl_resources) {
- $post['return_ssl_resources'] = true;
+ if (isset($this->use_ssl_resources)) {
+ $post['return_ssl_resources'] = (bool) $this->use_ssl_resources;
}
return array($get, $post);
}
diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php
index 766d0e199..f94a346b5 100644
--- a/plugins/Facebook/facebooksettings.php
+++ b/plugins/Facebook/facebooksettings.php
@@ -54,22 +54,11 @@ class FacebooksettingsAction extends FacebookAction
$noticesync = $this->boolean('noticesync');
$replysync = $this->boolean('replysync');
- $prefix = $this->trimmed('prefix');
$original = clone($this->flink);
$this->flink->set_flags($noticesync, false, $replysync, false);
$result = $this->flink->update($original);
- if ($prefix == '' || $prefix == '0') {
- // Facebook bug: saving empty strings to prefs now fails
- // http://bugs.developers.facebook.com/show_bug.cgi?id=7110
- $trimmed = $prefix . ' ';
- } else {
- $trimmed = substr($prefix, 0, 128);
- }
- $this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
- $trimmed);
-
if ($result === false) {
$this->showForm(_m('There was a problem saving your sync preferences!'));
} else {
@@ -110,16 +99,6 @@ class FacebooksettingsAction extends FacebookAction
$this->elementStart('li');
- $prefix = trim($this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX));
-
- $this->input('prefix', _m('Prefix'),
- ($prefix) ? $prefix : null,
- _m('A string to prefix notices with.'));
-
- $this->elementEnd('li');
-
- $this->elementStart('li');
-
$this->submit('save', _m('Save'));
$this->elementEnd('li');
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
index ac532e18b..1290fed55 100644
--- a/plugins/Facebook/facebookutil.php
+++ b/plugins/Facebook/facebookutil.php
@@ -81,97 +81,251 @@ function isFacebookBound($notice, $flink) {
function facebookBroadcastNotice($notice)
{
$facebook = getFacebook();
- $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE);
+ $flink = Foreign_link::getByUserID(
+ $notice->profile_id,
+ FACEBOOK_SERVICE
+ );
if (isFacebookBound($notice, $flink)) {
// Okay, we're good to go, update the FB status
- $status = null;
$fbuid = $flink->foreign_id;
$user = $flink->getUser();
- $attachments = $notice->attachments();
try {
- // Get the status 'verb' (prefix) the user has set
-
- // XXX: Does this call count against our per user FB request limit?
- // If so we should consider storing verb elsewhere or not storing
-
- $prefix = trim($facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX,
- $fbuid));
-
- $status = "$prefix $notice->content";
-
- $can_publish = $facebook->api_client->users_hasAppPermission('publish_stream',
- $fbuid);
-
- $can_update = $facebook->api_client->users_hasAppPermission('status_update',
- $fbuid);
- if (!empty($attachments) && $can_publish == 1) {
- $fbattachment = format_attachments($attachments);
- $facebook->api_client->stream_publish($status, $fbattachment,
- null, null, $fbuid);
- common_log(LOG_INFO,
- "Posted notice $notice->id w/attachment " .
- "to Facebook user's stream (fbuid = $fbuid).");
- } elseif ($can_update == 1 || $can_publish == 1) {
- $facebook->api_client->users_setStatus($status, $fbuid, false, true);
- common_log(LOG_INFO,
- "Posted notice $notice->id to Facebook " .
- "as a status update (fbuid = $fbuid).");
+ // Check permissions
+
+ common_debug(
+ 'FacebookPlugin - checking for publish_stream permission for user '
+ . "$user->nickname ($user->id), Facebook UID: $fbuid"
+ );
+
+ // NOTE: $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid)
+ // has been returning bogus results, so we're using FQL to check for
+ // publish_stream permission now
+
+ $fql = "SELECT publish_stream FROM permissions WHERE uid = $fbuid";
+ $result = $facebook->api_client->fql_query($fql);
+
+ $canPublish = 0;
+
+ if (!empty($result)) {
+ $canPublish = $result[0]['publish_stream'];
+ }
+
+ if ($canPublish == 1) {
+ common_debug(
+ "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
+ . 'has publish_stream permission.'
+ );
+ } else {
+ common_debug(
+ "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
+ . 'does NOT have publish_stream permission. Facebook '
+ . 'returned: ' . var_export($result, true)
+ );
+ }
+
+ common_debug(
+ 'FacebookPlugin - checking for status_update permission for user '
+ . "$user->nickname ($user->id), Facebook UID: $fbuid. "
+ );
+
+ $canUpdate = $facebook->api_client->users_hasAppPermission(
+ 'status_update',
+ $fbuid
+ );
+
+ if ($canUpdate == 1) {
+ common_debug(
+ "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
+ . 'has status_update permission.'
+ );
} else {
- $msg = "Not sending notice $notice->id to Facebook " .
- "because user $user->nickname hasn't given the " .
+ common_debug(
+ "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
+ .'does NOT have status_update permission. Facebook '
+ . 'returned: ' . var_export($canPublish, true)
+ );
+ }
+
+ // Post to Facebook
+
+ if ($notice->hasAttachments() && $canPublish == 1) {
+ publishStream($notice, $user, $fbuid);
+ } elseif ($canUpdate == 1 || $canPublish == 1) {
+ statusUpdate($notice, $user, $fbuid);
+ } else {
+ $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " .
+ "because user $user->nickname has not given the " .
'Facebook app \'status_update\' or \'publish_stream\' permission.';
common_log(LOG_WARNING, $msg);
}
// Finally, attempt to update the user's profile box
- if ($can_publish == 1 || $can_update == 1) {
- updateProfileBox($facebook, $flink, $notice);
+ if ($canPublish == 1 || $canUpdate == 1) {
+ updateProfileBox($facebook, $flink, $notice, $user);
}
} catch (FacebookRestClientException $e) {
+ return handleFacebookError($e, $notice, $flink);
+ }
+ }
- $code = $e->getCode();
-
- $msg = "Facebook returned error code $code: " .
- $e->getMessage() . ' - ' .
- "Unable to update Facebook status (notice $notice->id) " .
- "for $user->nickname (user id: $user->id)!";
+ return true;
+}
- common_log(LOG_WARNING, $msg);
+function handleFacebookError($e, $notice, $flink)
+{
+ $fbuid = $flink->foreign_id;
+ $user = $flink->getUser();
+ $code = $e->getCode();
+ $errmsg = $e->getMessage();
+
+ // XXX: Check for any others?
+ switch($code) {
+ case 100: // Invalid parameter
+ $msg = "FacebookPlugin - Facebook claims notice %d was posted with an invalid parameter (error code 100):"
+ . "\"%s\" (Notice details: nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). "
+ . "Removing notice from the Facebook queue for safety.";
+ common_log(
+ LOG_ERR, sprintf(
+ $msg,
+ $notice->id,
+ $errmsg,
+ $user->nickname,
+ $user->id,
+ $fbuid,
+ $notice->content
+ )
+ );
+ return true;
+ break;
+ case 200: // Permissions error
+ case 250: // Updating status requires the extended permission status_update
+ remove_facebook_app($flink);
+ return true; // dequeue
+ break;
+ case 341: // Feed action request limit reached
+ $msg = "FacebookPlugin - User %s (User ID=%d, Facebook ID=%d) has exceeded "
+ . "his/her limit for posting notices to Facebook today. Dequeuing "
+ . "notice %d.";
+ common_log(
+ LOG_INFO, sprintf(
+ $msg,
+ $user->nickname,
+ $user->id,
+ $fbuid,
+ $notice->id
+ )
+ );
+ // @fixme: We want to rety at a later time when the throttling has expired
+ // instead of just giving up.
+ return true;
+ break;
+ default:
+ $msg = "FacebookPlugin - Facebook returned an error we don't know how to deal with while trying to "
+ . "post notice %d. Error code: %d, error message: \"%s\". (Notice details: "
+ . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Removing notice "
+ . "from the Facebook queue for safety.";
+ common_log(
+ LOG_ERR, sprintf(
+ $msg,
+ $notice->id,
+ $code,
+ $errmsg,
+ $user->nickname,
+ $user->id,
+ $fbuid,
+ $notice->content
+ )
+ );
+ return true; // dequeue
+ break;
+ }
+}
- if ($code == 100 || $code == 200 || $code == 250) {
+function statusUpdate($notice, $user, $fbuid)
+{
+ common_debug(
+ "FacebookPlugin - Attempting to post notice $notice->id "
+ . "as a status update for $user->nickname ($user->id), "
+ . "Facebook UID: $fbuid"
+ );
- // 100 The account is 'inactive' (probably - this is not well documented)
- // 200 The application does not have permission to operate on the passed in uid parameter.
- // 250 Updating status requires the extended permission status_update or publish_stream.
- // see: http://wiki.developers.facebook.com/index.php/Users.setStatus#Example_Return_XML
+ $facebook = getFacebook();
+ $result = $facebook->api_client->users_setStatus(
+ $notice->content,
+ $fbuid,
+ false,
+ true
+ );
+
+ common_debug('Facebook returned: ' . var_export($result, true));
+
+ common_log(
+ LOG_INFO,
+ "FacebookPlugin - Posted notice $notice->id as a status "
+ . "update for $user->nickname ($user->id), "
+ . "Facebook UID: $fbuid"
+ );
+}
- remove_facebook_app($flink);
+function publishStream($notice, $user, $fbuid)
+{
+ common_debug(
+ "FacebookPlugin - Attempting to post notice $notice->id "
+ . "as stream item with attachment for $user->nickname ($user->id), "
+ . "Facebook UID: $fbuid"
+ );
- } else {
+ $fbattachment = format_attachments($notice->attachments());
- // Try sending again later.
+ $facebook = getFacebook();
+ $facebook->api_client->stream_publish(
+ $notice->content,
+ $fbattachment,
+ null,
+ null,
+ $fbuid
+ );
+
+ common_log(
+ LOG_INFO,
+ "FacebookPlugin - Posted notice $notice->id as a stream "
+ . "item with attachment for $user->nickname ($user->id), "
+ . "Facebook UID: $fbuid"
+ );
+}
- return false;
- }
+function updateProfileBox($facebook, $flink, $notice, $user) {
- }
- }
+ $facebook = getFacebook();
+ $fbaction = new FacebookAction(
+ $output = 'php://output',
+ $indent = null,
+ $facebook,
+ $flink
+ );
- return true;
+ $fbuid = $flink->foreign_id;
-}
+ common_debug(
+ 'FacebookPlugin - Attempting to update profile box with '
+ . "content from notice $notice->id for $user->nickname ($user->id), "
+ . "Facebook UID: $fbuid"
+ );
-function updateProfileBox($facebook, $flink, $notice) {
- $fbaction = new FacebookAction($output = 'php://output',
- $indent = null, $facebook, $flink);
$fbaction->updateProfileBox($notice);
+
+ common_debug(
+ 'FacebookPlugin - finished updating profile box for '
+ . "$user->nickname ($user->id) Facebook UID: $fbuid"
+ );
+
}
function format_attachments($attachments)
@@ -272,12 +426,12 @@ function remove_facebook_app($flink)
function mail_facebook_app_removed($user)
{
- common_init_locale($user->language);
-
$profile = $user->getProfile();
$site_name = common_config('site', 'name');
+ common_switch_locale($user->language);
+
$subject = sprintf(
_m('Your %1$s Facebook application access has been disabled.',
$site_name));
@@ -291,7 +445,7 @@ function mail_facebook_app_removed($user)
"re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"),
$user->nickname, $site_name);
- common_init_locale();
+ common_switch_locale();
return mail_to_user($user, $subject, $body);
}
diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
index 4bc00248c..dce10d230 100644
--- a/plugins/Facebook/locale/Facebook.pot
+++ b/plugins/Facebook/locale/Facebook.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,72 +16,129 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: facebookaction.php:171
-msgid "Home"
+#: facebookutil.php:285
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %2$s, and have disabled the Facebook application for "
+"your account. This may be because you have removed the Facebook "
+"application's authorization, or have deleted your Facebook account. You can "
+"re-enable the Facebook application and automatic status updating by re-"
+"installing the %2$s Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%2$s"
msgstr ""
-#: facebookaction.php:179
-msgid "Invite"
+#: FBConnectAuth.php:51
+msgid "You must be logged into Facebook to use Facebook Connect."
msgstr ""
-#: facebookaction.php:188
-msgid "Settings"
+#: FBConnectAuth.php:77
+msgid "There is already a local user linked with this Facebook."
msgstr ""
-#: facebookaction.php:228
+#: FBConnectAuth.php:90 FBConnectSettings.php:164
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: FBConnectAuth.php:95
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: FBConnectAuth.php:105
+msgid "Something weird happened."
+msgstr ""
+
+#: FBConnectAuth.php:119
#, php-format
msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet? "
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
msgstr ""
-#: facebookaction.php:230
-msgid " a new account."
+#: FBConnectAuth.php:125
+msgid "Facebook Account Setup"
msgstr ""
-#: facebookaction.php:236
-msgid "Register"
+#: FBConnectAuth.php:158
+msgid "Connection options"
msgstr ""
-#: facebookaction.php:249 facebookaction.php:275 facebooklogin.php:91
-msgid "Login"
+#: FBConnectAuth.php:183
+msgid "Create new account"
msgstr ""
-#: facebookaction.php:268
-msgid "Nickname"
+#: FBConnectAuth.php:185
+msgid "Create a new user with this nickname."
msgstr ""
-#: facebookaction.php:271 FBConnectAuth.php:196
+#: FBConnectAuth.php:188
+msgid "New nickname"
+msgstr ""
+
+#: FBConnectAuth.php:190
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: FBConnectAuth.php:193
+msgid "Create"
+msgstr ""
+
+#: FBConnectAuth.php:198
+msgid "Connect existing account"
+msgstr ""
+
+#: FBConnectAuth.php:200
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+
+#: FBConnectAuth.php:203
+msgid "Existing nickname"
+msgstr ""
+
+#: FBConnectAuth.php:206 facebookaction.php:271
msgid "Password"
msgstr ""
-#: facebookaction.php:281
-msgid "Lost or forgotten password?"
+#: FBConnectAuth.php:209
+msgid "Connect"
msgstr ""
-#: facebookaction.php:330 facebookhome.php:248
-msgid "Pagination"
+#: FBConnectAuth.php:225 FBConnectAuth.php:234
+msgid "Registration not allowed."
msgstr ""
-#: facebookaction.php:339 facebookhome.php:257
-msgid "After"
+#: FBConnectAuth.php:241
+msgid "Not a valid invitation code."
msgstr ""
-#: facebookaction.php:347 facebookhome.php:265
-msgid "Before"
+#: FBConnectAuth.php:251
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: facebookaction.php:365
-msgid "No notice content!"
+#: FBConnectAuth.php:256
+msgid "Nickname not allowed."
msgstr ""
-#: facebookaction.php:371
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
+#: FBConnectAuth.php:261
+msgid "Nickname already in use. Try another one."
msgstr ""
-#: facebookaction.php:430
-msgid "Notices"
+#: FBConnectAuth.php:279 FBConnectAuth.php:313 FBConnectAuth.php:333
+msgid "Error connecting user to Facebook."
+msgstr ""
+
+#: FBConnectAuth.php:299
+msgid "Invalid username or password."
+msgstr ""
+
+#: facebooklogin.php:91 facebookaction.php:249 facebookaction.php:275
+msgid "Login"
msgstr ""
#: facebookhome.php:111
@@ -117,6 +174,18 @@ msgstr ""
msgid "Skip"
msgstr ""
+#: facebookhome.php:248 facebookaction.php:330
+msgid "Pagination"
+msgstr ""
+
+#: facebookhome.php:257 facebookaction.php:339
+msgid "After"
+msgstr ""
+
+#: facebookhome.php:265 facebookaction.php:347
+msgid "Before"
+msgstr ""
+
#: facebookinvite.php:72
#, php-format
msgid "Thanks for inviting your friends to use %s"
@@ -145,208 +214,123 @@ msgstr ""
msgid "Send invitations"
msgstr ""
-#: FacebookPlugin.php:413 FacebookPlugin.php:433
+#: FacebookPlugin.php:195 FacebookPlugin.php:488 FacebookPlugin.php:510
+#: facebookadminpanel.php:54
msgid "Facebook"
msgstr ""
-#: FacebookPlugin.php:414
+#: FacebookPlugin.php:196
+msgid "Facebook integration configuration"
+msgstr ""
+
+#: FacebookPlugin.php:489
msgid "Login or register using Facebook"
msgstr ""
-#: FacebookPlugin.php:434 FBConnectSettings.php:56
+#: FacebookPlugin.php:511 FBConnectSettings.php:56
msgid "Facebook Connect Settings"
msgstr ""
-#: FacebookPlugin.php:533
+#: FacebookPlugin.php:617
msgid ""
"The Facebook plugin allows you to integrate your StatusNet instance with <a "
"href=\"http://facebook.com/\">Facebook</a> and Facebook Connect."
msgstr ""
-#: facebookremove.php:58
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#: facebooksettings.php:74
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#: facebooksettings.php:76
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:99
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:106
-msgid "Send \"@\" replies to Facebook."
+#: FBConnectLogin.php:33
+msgid "Already logged in."
msgstr ""
-#: facebooksettings.php:115
-msgid "Prefix"
+#: FBConnectLogin.php:41
+msgid "Login with your Facebook Account"
msgstr ""
-#: facebooksettings.php:117
-msgid "A string to prefix notices with."
+#: FBConnectLogin.php:55
+msgid "Facebook Login"
msgstr ""
-#: facebooksettings.php:123
-msgid "Save"
+#: facebookremove.php:58
+msgid "Couldn't remove Facebook user."
msgstr ""
-#: facebooksettings.php:133
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
+#: facebookaction.php:171
+msgid "Home"
msgstr ""
-#: facebooksettings.php:146
-#, php-format
-msgid "Allow %s to update my Facebook status"
+#: facebookaction.php:179
+msgid "Invite"
msgstr ""
-#: facebooksettings.php:156
-msgid "Sync preferences"
+#: facebookaction.php:188
+msgid "Settings"
msgstr ""
-#: facebookutil.php:285
+#: facebookaction.php:228
#, php-format
msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account. You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
msgstr ""
-#: FBConnectAuth.php:51
-msgid "You must be logged into Facebook to use Facebook Connect."
+#: facebookaction.php:230
+msgid " a new account."
msgstr ""
-#: FBConnectAuth.php:77
-msgid "There is already a local user linked with this Facebook."
+#: facebookaction.php:236
+msgid "Register"
msgstr ""
-#: FBConnectAuth.php:90 FBConnectSettings.php:164
-msgid "There was a problem with your session token. Try again, please."
+#: facebookaction.php:268
+msgid "Nickname"
msgstr ""
-#: FBConnectAuth.php:95
-msgid "You can't register if you don't agree to the license."
+#: facebookaction.php:281
+msgid "Lost or forgotten password?"
msgstr ""
-#: FBConnectAuth.php:105
-msgid "Something weird happened."
+#: facebookaction.php:365
+msgid "No notice content!"
msgstr ""
-#: FBConnectAuth.php:119
+#: facebookaction.php:371
#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#: FBConnectAuth.php:125
-msgid "Facebook Account Setup"
-msgstr ""
-
-#: FBConnectAuth.php:153
-msgid "Connection options"
-msgstr ""
-
-#: FBConnectAuth.php:162
-msgid "My text and files are available under "
-msgstr ""
-
-#: FBConnectAuth.php:165
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-
-#: FBConnectAuth.php:173
-msgid "Create new account"
-msgstr ""
-
-#: FBConnectAuth.php:175
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: FBConnectAuth.php:178
-msgid "New nickname"
-msgstr ""
-
-#: FBConnectAuth.php:180
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: FBConnectAuth.php:183
-msgid "Create"
-msgstr ""
-
-#: FBConnectAuth.php:188
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:190
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:193
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:199
-msgid "Connect"
-msgstr ""
-
-#: FBConnectAuth.php:215 FBConnectAuth.php:224
-msgid "Registration not allowed."
+msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: FBConnectAuth.php:231
-msgid "Not a valid invitation code."
+#: facebookaction.php:430
+msgid "Notices"
msgstr ""
-#: FBConnectAuth.php:241
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: facebookadminpanel.php:65
+msgid "Facebook integration settings"
msgstr ""
-#: FBConnectAuth.php:246
-msgid "Nickname not allowed."
+#: facebookadminpanel.php:129
+msgid "Invalid Facebook API key. Max length is 255 characters."
msgstr ""
-#: FBConnectAuth.php:251
-msgid "Nickname already in use. Try another one."
+#: facebookadminpanel.php:135
+msgid "Invalid Facebook API secret. Max length is 255 characters."
msgstr ""
-#: FBConnectAuth.php:269 FBConnectAuth.php:303 FBConnectAuth.php:323
-msgid "Error connecting user to Facebook."
+#: facebookadminpanel.php:188
+msgid "Facebook application settings"
msgstr ""
-#: FBConnectAuth.php:289
-msgid "Invalid username or password."
+#: facebookadminpanel.php:194
+msgid "API key"
msgstr ""
-#: FBConnectLogin.php:33
-msgid "Already logged in."
+#: facebookadminpanel.php:195
+msgid "API key provided by Facebook"
msgstr ""
-#: FBConnectLogin.php:41
-msgid "Login with your Facebook Account"
+#: facebookadminpanel.php:203
+msgid "Secret"
msgstr ""
-#: FBConnectLogin.php:55
-msgid "Facebook Login"
+#: facebookadminpanel.php:204
+msgid "API secret provided by Facebook"
msgstr ""
#: FBConnectSettings.php:67
@@ -393,3 +377,47 @@ msgstr ""
#: FBConnectSettings.php:197
msgid "Not sure what you're trying to do."
msgstr ""
+
+#: facebooksettings.php:74
+msgid "There was a problem saving your sync preferences!"
+msgstr ""
+
+#: facebooksettings.php:76
+msgid "Sync preferences saved."
+msgstr ""
+
+#: facebooksettings.php:99
+msgid "Automatically update my Facebook status with my notices."
+msgstr ""
+
+#: facebooksettings.php:106
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#: facebooksettings.php:115
+msgid "Prefix"
+msgstr ""
+
+#: facebooksettings.php:117
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: facebooksettings.php:123
+msgid "Save"
+msgstr ""
+
+#: facebooksettings.php:133
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: facebooksettings.php:146
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: facebooksettings.php:156
+msgid "Sync preferences"
+msgstr ""
diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php
index 9143ff69c..d984ec1af 100644
--- a/plugins/FirePHP/FirePHPPlugin.php
+++ b/plugins/FirePHP/FirePHPPlugin.php
@@ -24,11 +24,13 @@ Author URI: http://candrews.integralblue.com/
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
+ * @category Plugin
* @package MinifyPlugin
* @maintainer Craig Andrews <candrews@integralblue.com>
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
*/
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot
new file mode 100644
index 000000000..fa16f283e
--- /dev/null
+++ b/plugins/FirePHP/locale/FirePHP.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FirePHPPlugin.php:66
+msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
+msgstr ""
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index bc5899943..3815a31fa 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -376,7 +376,7 @@ class GeonamesPlugin extends Plugin
return true;
}
- $url = 'http://sw.geonames.org/' . $location->location_id . '/';
+ $url = 'http://sws.geonames.org/' . $location->location_id . '/';
// it's been filled, so don't process further.
return false;
diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot
index d7275b929..d3a4cd86b 100644
--- a/plugins/Gravatar/locale/Gravatar.pot
+++ b/plugins/Gravatar/locale/Gravatar.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php
index d1e920b00..66be799d3 100644
--- a/plugins/Imap/ImapPlugin.php
+++ b/plugins/Imap/ImapPlugin.php
@@ -21,8 +21,9 @@
*
* @category Plugin
* @package StatusNet
- * @author Zach Copley <zach@status.net>
+ * @author Craig Andrews <candrews@integralblue.com
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -37,6 +38,7 @@ if (!defined('STATUSNET')) {
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php
index 4c0edeaa1..cfc08c1ee 100644
--- a/plugins/Imap/imapmanager.php
+++ b/plugins/Imap/imapmanager.php
@@ -23,6 +23,8 @@
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @maintainer Craig Andrews <candrews@integralblue.com>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot
new file mode 100644
index 000000000..ee8452aaa
--- /dev/null
+++ b/plugins/Imap/locale/Imap.pot
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: imapmailhandler.php:28
+msgid "Error"
+msgstr ""
+
+#: ImapPlugin.php:101
+msgid ""
+"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
+"incoming mail containing user posts."
+msgstr ""
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index a4d1a5d05..50c1b5a20 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
new file mode 100644
index 000000000..a0f466fcb
--- /dev/null
+++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: InfiniteScrollPlugin.php:54
+msgid ""
+"Infinite Scroll adds the following functionality to your StatusNet "
+"installation: When a user scrolls towards the bottom of the page, the next "
+"page of notices is automatically retrieved and appended. This means they "
+"never need to click \"Next Page\", which dramatically increases stickiness."
+msgstr ""
diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index 0dfc4c63b..52d326287 100644
--- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
new file mode 100644
index 000000000..8f09b1e51
--- /dev/null
+++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: LdapAuthenticationPlugin.php:146
+msgid ""
+"The LDAP Authentication plugin allows for StatusNet to handle authentication "
+"through LDAP."
+msgstr ""
diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
index 97103d158..3842385cf 100644
--- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
+++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
new file mode 100644
index 000000000..8156f6146
--- /dev/null
+++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: LdapAuthorizationPlugin.php:124
+msgid ""
+"The LDAP Authorization plugin allows for StatusNet to handle authorization "
+"through LDAP."
+msgstr ""
diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
index ee436d824..1f1647a75 100644
--- a/plugins/LdapCommon/LdapCommon.php
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/LdapCommon/MemcacheSchemaCache.php b/plugins/LdapCommon/MemcacheSchemaCache.php
index 6b91d17d6..4ee2e8e16 100644
--- a/plugins/LdapCommon/MemcacheSchemaCache.php
+++ b/plugins/LdapCommon/MemcacheSchemaCache.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index cdff9f4e6..06ea49ff5 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot
new file mode 100644
index 000000000..47ed36727
--- /dev/null
+++ b/plugins/LilUrl/locale/LilUrl.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index 868933fd4..e7240a644 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -125,8 +125,8 @@ class MapstractionPlugin extends Plugin
$action->script('http://tile.cloudmade.com/wml/0.2/web-maps-lite.js');
break;
case 'google':
- $action->script(sprintf('http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=false&amp;key=%s',
- $this->apikey));
+ $action->script(sprintf('http://maps.google.com/maps?file=api&v=2&sensor=false&key=%s',
+ urlencode($this->apikey)));
break;
case 'microsoft':
$action->script('http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
@@ -137,7 +137,7 @@ class MapstractionPlugin extends Plugin
break;
case 'yahoo':
$action->script(sprintf('http://api.maps.yahoo.com/ajaxymap?v=3.8&appid=%s',
- $this->apikey));
+ urlencode($this->apikey)));
break;
case 'geocommons': // don't support this yet
default:
diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index e73aa76e8..5dab670e2 100644
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -38,6 +38,7 @@ if (!defined('STATUSNET')) {
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 1dd5dbbcc..764bf7b29 100644
--- a/plugins/Mapstraction/locale/Mapstraction.pot
+++ b/plugins/Mapstraction/locale/Mapstraction.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,18 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: allmap.php:71
-#, php-format
-msgid "%s friends map"
+#: MapstractionPlugin.php:182
+msgid "Map"
msgstr ""
-#: allmap.php:74
-#, php-format
-msgid "%s friends map, page %d"
+#: MapstractionPlugin.php:193
+msgid "Full size"
+msgstr ""
+
+#: MapstractionPlugin.php:205
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a> JavaScript library."
msgstr ""
#: map.php:72
@@ -34,18 +38,14 @@ msgstr ""
msgid "User has no profile."
msgstr ""
-#: MapstractionPlugin.php:182
-msgid "Map"
-msgstr ""
-
-#: MapstractionPlugin.php:193
-msgid "Full size"
+#: allmap.php:71
+#, php-format
+msgid "%s friends map"
msgstr ""
-#: MapstractionPlugin.php:205
-msgid ""
-"Show maps of users' and friends' notices with <a href=\"http://www."
-"mapstraction.com/\">Mapstraction</a> JavaScript library."
+#: allmap.php:74
+#, php-format
+msgid "%s friends map, page %d"
msgstr ""
#: usermap.php:71
diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index b809c1b8e..7dab8e10a 100644
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -38,6 +38,7 @@ if (!defined('STATUSNET')) {
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 4b7a6c26b..53cfe6bb0 100644
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -104,7 +104,7 @@ function showMapstraction(element, notices) {
pt = new mxn.LatLonPoint(lat, lon);
mkr = new mxn.Marker(pt);
- mkr.setIcon(n['user']['profile_image_url']);
+ mkr.setIcon(n['user']['profile_image_url'], [24, 24]);
mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] +
'<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>');
diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php
index ff47b6ada..094334f60 100644
--- a/plugins/Mapstraction/usermap.php
+++ b/plugins/Mapstraction/usermap.php
@@ -38,6 +38,7 @@ if (!defined('STATUSNET')) {
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/MemcachedPlugin.php b/plugins/MemcachedPlugin.php
index 707e6db9a..77b989b95 100644
--- a/plugins/MemcachedPlugin.php
+++ b/plugins/MemcachedPlugin.php
@@ -22,8 +22,10 @@
*
* @category Cache
* @package StatusNet
- * @author Evan Prodromou <evan@status.net>, Craig Andrews <candrews@integralblue.com>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Craig Andrews <candrews@integralblue.com>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -43,8 +45,10 @@ if (!defined('STATUSNET')) {
*
* @category Cache
* @package StatusNet
- * @author Evan Prodromou <evan@status.net>, Craig Andrews <candrews@integralblue.com>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Craig Andrews <candrews@integralblue.com>
* @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index 5600d5fcc..ec8c9e217 100644
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -50,6 +50,7 @@ class MeteorPlugin extends RealtimePlugin
public $controlport = null;
public $controlserver = null;
public $channelbase = null;
+ public $persistent = true;
protected $_socket = null;
function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='')
@@ -102,8 +103,14 @@ class MeteorPlugin extends RealtimePlugin
function _connect()
{
$controlserver = (empty($this->controlserver)) ? $this->webserver : $this->controlserver;
+
+ $errno = $errstr = null;
+ $timeout = 5;
+ $flags = STREAM_CLIENT_CONNECT;
+ if ($this->persistent) $flags |= STREAM_CLIENT_PERSISTENT;
+
// May throw an exception.
- $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}");
+ $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}", $errno, $errstr, $timeout, $flags);
if (!$this->_socket) {
throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}");
}
@@ -124,8 +131,10 @@ class MeteorPlugin extends RealtimePlugin
function _disconnect()
{
- $cnt = fwrite($this->_socket, "QUIT\n");
- @fclose($this->_socket);
+ if (!$this->persistent) {
+ $cnt = fwrite($this->_socket, "QUIT\n");
+ @fclose($this->_socket);
+ }
}
// Meteord flips out with default '/' separator
diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php
index 69def6064..13010e75a 100644
--- a/plugins/Minify/MinifyPlugin.php
+++ b/plugins/Minify/MinifyPlugin.php
@@ -29,6 +29,7 @@ Author URI: http://candrews.integralblue.com/
/**
* @package MinifyPlugin
* @maintainer Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
*/
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot
new file mode 100644
index 000000000..6f7372d40
--- /dev/null
+++ b/plugins/Minify/locale/Minify.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: MinifyPlugin.php:179
+msgid ""
+"The Minify plugin minifies your CSS and Javascript, removing whitespace and "
+"comments."
+msgstr ""
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 1c61b4fe5..6076bbde0 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -138,6 +138,7 @@ class MobileProfilePlugin extends WAP20Plugin
'vodafone',
'wap1',
'wap2',
+ 'webos',
'windows ce'
);
@@ -254,6 +255,10 @@ class MobileProfilePlugin extends WAP20Plugin
$action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld');
}
+ // Allow other plugins to load their styles.
+ Event::handle('EndShowStatusNetStyles', array($action));
+ Event::handle('EndShowLaconicaStyles', array($action));
+
return false;
}
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
new file mode 100644
index 000000000..9495e975b
--- /dev/null
+++ b/plugins/MobileProfile/locale/MobileProfile.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: MobileProfilePlugin.php:424
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr ""
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index f183bc7ae..c61e2cc5f 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -87,6 +87,8 @@ class OStatusPlugin extends Plugin
// Outgoing from our internal PuSH hub
$qm->connect('hubconf', 'HubConfQueueHandler');
+ $qm->connect('hubprep', 'HubPrepQueueHandler');
+
$qm->connect('hubout', 'HubOutQueueHandler');
// Outgoing Salmon replies (when we don't need a return value)
@@ -102,8 +104,10 @@ class OStatusPlugin extends Plugin
*/
function onStartEnqueueNotice($notice, &$transports)
{
- // put our transport first, in case there's any conflict (like OMB)
- array_unshift($transports, 'ostatus');
+ if ($notice->isLocal()) {
+ // put our transport first, in case there's any conflict (like OMB)
+ array_unshift($transports, 'ostatus');
+ }
return true;
}
@@ -257,7 +261,7 @@ class OStatusPlugin extends Plugin
$matches = array();
// Webfinger matches: @user@example.com
- if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
+ if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
$text,
$wmatches,
PREG_OFFSET_CAPTURE)) {
@@ -452,6 +456,7 @@ class OStatusPlugin extends Plugin
return false;
}
}
+ return true;
}
/**
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 994af6e95..28714514f 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -446,4 +446,18 @@ class OStatusSubAction extends Action
{
return common_local_url('ostatussub');
}
+
+ /**
+ * Disable the send-notice form at the top of the page.
+ * This is really just a hack for the broken CSS in the Cloudy theme,
+ * I think; copying from other non-notice-navigation pages that do this
+ * as well. There will be plenty of others also broken.
+ *
+ * @fixme fix the cloudy theme
+ * @fixme do this in a more general way
+ */
+ function showNoticeForm() {
+ // nop
+ }
+
}
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index cdace3c1f..7db528a4e 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -260,6 +260,37 @@ class HubSub extends Memcached_DataObject
$retries = intval(common_config('ostatus', 'hub_retries'));
}
+ if (common_config('ostatus', 'local_push_bypass')) {
+ // If target is a local site, bypass the web server and drop the
+ // item directly into the target's input queue.
+ $url = parse_url($this->callback);
+ $wildcard = common_config('ostatus', 'local_wildcard');
+ $site = Status_network::getFromHostname($url['host'], $wildcard);
+
+ if ($site) {
+ if ($this->secret) {
+ $hmac = 'sha1=' . hash_hmac('sha1', $atom, $this->secret);
+ } else {
+ $hmac = '';
+ }
+
+ // Hack: at the moment we stick the subscription ID in the callback
+ // URL so we don't have to look inside the Atom to route the subscription.
+ // For now this means we need to extract that from the target URL
+ // so we can include it in the data.
+ $parts = explode('/', $url['path']);
+ $subId = intval(array_pop($parts));
+
+ $data = array('feedsub_id' => $subId,
+ 'post' => $atom,
+ 'hmac' => $hmac);
+ common_log(LOG_DEBUG, "Cross-site PuSH bypass enqueueing straight to $site->nickname feed $subId");
+ $qm = QueueManager::get();
+ $qm->enqueue($data, 'pushin', $site->nickname);
+ return;
+ }
+ }
+
// We dare not clone() as when the clone is discarded it'll
// destroy the result data for the parent query.
// @fixme use clone() again when it's safe to copy an
@@ -274,6 +305,26 @@ class HubSub extends Memcached_DataObject
}
/**
+ * Queue up a large batch of pushes to multiple subscribers
+ * for this same topic update.
+ *
+ * If queues are disabled, this will run immediately.
+ *
+ * @param string $atom well-formed Atom feed
+ * @param array $pushCallbacks list of callback URLs
+ */
+ function bulkDistribute($atom, $pushCallbacks)
+ {
+ $data = array('atom' => $atom,
+ 'topic' => $this->topic,
+ 'pushCallbacks' => $pushCallbacks);
+ common_log(LOG_INFO, "Queuing PuSH batch: $this->topic to " .
+ count($pushCallbacks) . " sites");
+ $qm = QueueManager::get();
+ $qm->enqueue($data, 'hubprep');
+ }
+
+ /**
* Send a 'fat ping' to the subscriber's callback endpoint
* containing the given Atom feed chunk.
*
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index e3b3daa2c..5d3f37cd0 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1001,7 +1001,7 @@ class Ostatus_profile extends Memcached_DataObject
return;
}
if (!common_valid_http_url($url)) {
- throw new ServerException(_m("Invalid avatar URL %s"), $url);
+ throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url));
}
if ($this->isGroup()) {
@@ -1303,15 +1303,23 @@ class Ostatus_profile extends Memcached_DataObject
$ok = $oprofile->insert();
- if ($ok) {
- $avatar = self::getActivityObjectAvatar($object, $hints);
- if ($avatar) {
+ if (!$ok) {
+ throw new ServerException("Can't save OStatus profile");
+ }
+
+ $avatar = self::getActivityObjectAvatar($object, $hints);
+
+ if ($avatar) {
+ try {
$oprofile->updateAvatar($avatar);
+ } catch (Exception $ex) {
+ // Profile is saved, but Avatar is messed up. We're
+ // just going to continue.
+ common_log(LOG_WARNING, "Exception saving OStatus profile avatar: ". $ex->getMessage());
}
- return $oprofile;
- } else {
- throw new ServerException("Can't save OStatus profile");
}
+
+ return $oprofile;
}
/**
@@ -1330,7 +1338,11 @@ class Ostatus_profile extends Memcached_DataObject
}
$avatar = self::getActivityObjectAvatar($object, $hints);
if ($avatar) {
- $this->updateAvatar($avatar);
+ try {
+ $this->updateAvatar($avatar);
+ } catch (Exception $ex) {
+ common_log(LOG_WARNING, "Exception saving OStatus profile avatar: " . $ex->getMessage());
+ }
}
}
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 80cfbbf15..34c9be277 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -30,6 +30,7 @@ class DiscoveryHints {
case Discovery::PROFILEPAGE:
$hints['profileurl'] = $link['href'];
break;
+ case Salmon::NS_MENTIONS:
case Salmon::NS_REPLIES:
$hints['salmon'] = $link['href'];
break;
@@ -83,7 +84,7 @@ class DiscoveryHints {
$hints['fullname'] = implode(' ', $hcard['n']);
}
- if (array_key_exists('photo', $hcard)) {
+ if (array_key_exists('photo', $hcard) && count($hcard['photo'])) {
$hints['avatar'] = $hcard['photo'][0];
}
diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index 4809f9d35..4ac243832 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -104,7 +104,7 @@ class FeedDiscovery
$response = $client->get($url);
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_ERR, __METHOD__ . " Failure for $url - " . $e->getMessage());
- throw new FeedSubBadURLException($e);
+ throw new FeedSubBadURLException($e->getMessage());
}
if ($htmlOk) {
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index d1e58f1d6..8905d2e21 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -25,6 +25,18 @@
*/
class OStatusQueueHandler extends QueueHandler
{
+ // If we have more than this many subscribing sites on a single feed,
+ // break up the PuSH distribution into smaller batches which will be
+ // rolled into the queue progressively. This reduces disruption to
+ // other, shorter activities being enqueued while we work.
+ const MAX_UNBATCHED = 50;
+
+ // Each batch (a 'hubprep' entry) will have this many items.
+ // Selected to provide a balance between queue packet size
+ // and number of batches that will end up getting processed.
+ // For 20,000 target sites, 1000 should work acceptably.
+ const BATCH_SIZE = 1000;
+
function transport()
{
return 'ostatus';
@@ -147,14 +159,31 @@ class OStatusQueueHandler extends QueueHandler
/**
* Queue up direct feed update pushes to subscribers on our internal hub.
+ * If there are a large number of subscriber sites, intermediate bulk
+ * distribution triggers may be queued.
+ *
* @param string $atom update feed, containing only new/changed items
* @param HubSub $sub open query of subscribers
*/
function pushFeedInternal($atom, $sub)
{
common_log(LOG_INFO, "Preparing $sub->N PuSH distribution(s) for $sub->topic");
+ $n = 0;
+ $batch = array();
while ($sub->fetch()) {
- $sub->distribute($atom);
+ $n++;
+ if ($n < self::MAX_UNBATCHED) {
+ $sub->distribute($atom);
+ } else {
+ $batch[] = $sub->callback;
+ if (count($batch) >= self::BATCH_SIZE) {
+ $sub->bulkDistribute($atom, $batch);
+ $batch = array();
+ }
+ }
+ }
+ if (count($batch) >= 0) {
+ $sub->bulkDistribute($atom, $batch);
}
}
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 7e33a0eed..97d593ead 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,297 +16,316 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: actions/groupsalmon.php:51
-msgid "Can't accept remote posts for a remote group."
-msgstr ""
-
-#: actions/groupsalmon.php:123
-msgid "Can't read profile to set up group membership."
+#: OStatusPlugin.php:210 OStatusPlugin.php:913 actions/ostatusinit.php:99
+msgid "Subscribe"
msgstr ""
-#: actions/groupsalmon.php:126 actions/groupsalmon.php:169
-msgid "Groups can't join groups."
+#: OStatusPlugin.php:228 OStatusPlugin.php:635 actions/ostatussub.php:105
+#: actions/ostatusinit.php:96
+msgid "Join"
msgstr ""
-#: actions/groupsalmon.php:153
+#: OStatusPlugin.php:451
#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
+msgid "Sent from %s via OStatus"
msgstr ""
-#: actions/groupsalmon.php:166
-msgid "Can't read profile to cancel group membership."
+#: OStatusPlugin.php:503
+msgid "Could not set up remote subscription."
msgstr ""
-#: actions/groupsalmon.php:182
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
+#: OStatusPlugin.php:619
+msgid "Could not set up remote group membership."
msgstr ""
-#: actions/ostatusinit.php:40
-msgid "You can use the local subscription!"
+#: OStatusPlugin.php:636
+#, php-format
+msgid "%s has joined group %s."
msgstr ""
-#: actions/ostatusinit.php:61
-msgid "There was a problem with your session token. Try again, please."
+#: OStatusPlugin.php:644
+msgid "Failed joining remote group."
msgstr ""
-#: actions/ostatusinit.php:79 actions/ostatussub.php:439
-msgid "Subscribe to user"
+#: OStatusPlugin.php:684
+msgid "Leave"
msgstr ""
-#: actions/ostatusinit.php:97
+#: OStatusPlugin.php:685
#, php-format
-msgid "Subscribe to %s"
+msgid "%s has left group %s."
msgstr ""
-#: actions/ostatusinit.php:102
-msgid "User nickname"
+#: OStatusPlugin.php:844
+msgid "Remote"
msgstr ""
-#: actions/ostatusinit.php:103
-msgid "Nickname of the user you want to follow"
+#: OStatusPlugin.php:883
+msgid "Profile update"
msgstr ""
-#: actions/ostatusinit.php:106
-msgid "Profile Account"
+#: OStatusPlugin.php:884
+#, php-format
+msgid "%s has updated their profile page."
msgstr ""
-#: actions/ostatusinit.php:107
-msgid "Your account id (i.e. user@identi.ca)"
+#: OStatusPlugin.php:928
+msgid ""
+"Follow people across social networks that implement <a href=\"http://ostatus."
+"org/\">OStatus</a>."
msgstr ""
-#: actions/ostatusinit.php:110 actions/ostatussub.php:115
-#: OStatusPlugin.php:205
-msgid "Subscribe"
+#: classes/Ostatus_profile.php:566
+msgid "Show more"
msgstr ""
-#: actions/ostatusinit.php:128
-msgid "Must provide a remote profile."
+#: classes/Ostatus_profile.php:1004
+#, php-format
+msgid "Invalid avatar URL %s"
msgstr ""
-#: actions/ostatusinit.php:138
-msgid "Couldn't look up OStatus account profile."
+#: classes/Ostatus_profile.php:1014
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s"
msgstr ""
-#: actions/ostatusinit.php:153
-msgid "Couldn't confirm remote profile address."
+#: classes/Ostatus_profile.php:1022
+#, php-format
+msgid "Unable to fetch avatar from %s"
msgstr ""
-#: actions/ostatusinit.php:171
-msgid "OStatus Connect"
+#: lib/salmonaction.php:41
+msgid "This method requires a POST."
msgstr ""
-#: actions/ostatussub.php:68
-msgid "Address or profile URL"
+#: lib/salmonaction.php:45
+msgid "Salmon requires application/magic-envelope+xml"
msgstr ""
-#: actions/ostatussub.php:70
-msgid "Enter the profile URL of a PubSubHubbub-enabled feed"
+#: lib/salmonaction.php:55
+msgid "Salmon signature verification failed."
msgstr ""
-#: actions/ostatussub.php:74
-msgid "Continue"
+#: lib/salmonaction.php:67
+msgid "Salmon post must be an Atom entry."
msgstr ""
-#: actions/ostatussub.php:112 OStatusPlugin.php:503
-msgid "Join"
+#: lib/salmonaction.php:115
+msgid "Unrecognized activity type."
msgstr ""
-#: actions/ostatussub.php:113
-msgid "Join this group"
+#: lib/salmonaction.php:123
+msgid "This target doesn't understand posts."
msgstr ""
-#: actions/ostatussub.php:116
-msgid "Subscribe to this user"
+#: lib/salmonaction.php:128
+msgid "This target doesn't understand follows."
msgstr ""
-#: actions/ostatussub.php:137
-msgid "You are already subscribed to this user."
+#: lib/salmonaction.php:133
+msgid "This target doesn't understand unfollows."
msgstr ""
-#: actions/ostatussub.php:165
-msgid "You are already a member of this group."
+#: lib/salmonaction.php:138
+msgid "This target doesn't understand favorites."
msgstr ""
-#: actions/ostatussub.php:286
-msgid "Empty remote profile URL!"
+#: lib/salmonaction.php:143
+msgid "This target doesn't understand unfavorites."
msgstr ""
-#: actions/ostatussub.php:297
-msgid "Invalid address format."
+#: lib/salmonaction.php:148
+msgid "This target doesn't understand share events."
msgstr ""
-#: actions/ostatussub.php:302
-msgid "Invalid URL or could not reach server."
+#: lib/salmonaction.php:153
+msgid "This target doesn't understand joins."
msgstr ""
-#: actions/ostatussub.php:304
-msgid "Cannot read feed; server returned error."
+#: lib/salmonaction.php:158
+msgid "This target doesn't understand leave events."
msgstr ""
-#: actions/ostatussub.php:306
-msgid "Cannot read feed; server returned an empty page."
+#: tests/gettext-speedtest.php:57
+msgid "Feeds"
msgstr ""
-#: actions/ostatussub.php:308
-msgid "Bad HTML, could not find feed link."
+#: actions/ostatusgroup.php:75
+msgid "Join group"
msgstr ""
-#: actions/ostatussub.php:310
-msgid "Could not find a feed linked from this URL."
+#: actions/ostatusgroup.php:77
+msgid "OStatus group's address, like http://example.net/group/nickname"
msgstr ""
-#: actions/ostatussub.php:312
-msgid "Not a recognized feed type."
+#: actions/ostatusgroup.php:81 actions/ostatussub.php:71
+msgid "Continue"
msgstr ""
-#: actions/ostatussub.php:315
-#, php-format
-msgid "Bad feed URL: %s %s"
+#: actions/ostatusgroup.php:100
+msgid "You are already a member of this group."
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatussub.php:336
+#: actions/ostatusgroup.php:135
msgid "Already a member!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatussub.php:346
+#: actions/ostatusgroup.php:146
msgid "Remote group join failed!"
msgstr ""
#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatussub.php:350
+#: actions/ostatusgroup.php:150
msgid "Remote group join aborted!"
msgstr ""
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:356
-msgid "Already subscribed!"
+#. TRANS: Page title for OStatus remote group join form
+#: actions/ostatusgroup.php:163
+msgid "Confirm joining remote group"
msgstr ""
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:361
-msgid "Remote subscription failed!"
+#: actions/ostatusgroup.php:174
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
msgstr ""
-#. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:459
-msgid "Authorize subscription"
+#: actions/groupsalmon.php:51
+msgid "Can't accept remote posts for a remote group."
msgstr ""
-#: actions/ostatussub.php:470
-msgid ""
-"You can subscribe to users from other supported sites. Paste their address "
-"or profile URI below:"
+#: actions/groupsalmon.php:124
+msgid "Can't read profile to set up group membership."
msgstr ""
-#: classes/Ostatus_profile.php:789
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s"
+#: actions/groupsalmon.php:127 actions/groupsalmon.php:170
+msgid "Groups can't join groups."
msgstr ""
-#: classes/Ostatus_profile.php:797
+#: actions/groupsalmon.php:154
#, php-format
-msgid "Unable to fetch avatar from %s"
+msgid "Could not join remote user %1$s to group %2$s."
msgstr ""
-#: lib/salmonaction.php:41
-msgid "This method requires a POST."
+#: actions/groupsalmon.php:167
+msgid "Can't read profile to cancel group membership."
msgstr ""
-#: lib/salmonaction.php:45
-msgid "Salmon requires application/magic-envelope+xml"
+#: actions/groupsalmon.php:183
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
msgstr ""
-#: lib/salmonaction.php:55
-msgid "Salmon signature verification failed."
+#: actions/ostatussub.php:65
+msgid "Subscribe to"
msgstr ""
-#: lib/salmonaction.php:67
-msgid "Salmon post must be an Atom entry."
+#: actions/ostatussub.php:67
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname"
msgstr ""
-#: lib/salmonaction.php:115
-msgid "Unrecognized activity type."
+#: actions/ostatussub.php:106
+msgid "Join this group"
msgstr ""
-#: lib/salmonaction.php:123
-msgid "This target doesn't understand posts."
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:108 actions/ostatussub.php:400
+msgid "Confirm"
msgstr ""
-#: lib/salmonaction.php:128
-msgid "This target doesn't understand follows."
+#: actions/ostatussub.php:109
+msgid "Subscribe to this user"
msgstr ""
-#: lib/salmonaction.php:133
-msgid "This target doesn't understand unfollows."
+#: actions/ostatussub.php:130
+msgid "You are already subscribed to this user."
msgstr ""
-#: lib/salmonaction.php:138
-msgid "This target doesn't understand favorites."
+#: actions/ostatussub.php:247 actions/ostatussub.php:253
+#: actions/ostatussub.php:272
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname"
msgstr ""
-#: lib/salmonaction.php:143
-msgid "This target doesn't understand unfavorites."
+#: actions/ostatussub.php:256 actions/ostatussub.php:259
+#: actions/ostatussub.php:262 actions/ostatussub.php:265
+#: actions/ostatussub.php:268
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
msgstr ""
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand share events."
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:301
+msgid "Already subscribed!"
msgstr ""
-#: lib/salmonaction.php:153
-msgid "This target doesn't understand joins."
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:306
+msgid "Remote subscription failed!"
msgstr ""
-#: lib/salmonaction.php:158
-msgid "This target doesn't understand leave events."
+#: actions/ostatussub.php:380 actions/ostatusinit.php:81
+msgid "Subscribe to user"
msgstr ""
-#: OStatusPlugin.php:319
-#, php-format
-msgid "Sent from %s via OStatus"
+#: actions/ostatussub.php:411
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
msgstr ""
-#: OStatusPlugin.php:371
-msgid "Could not set up remote subscription."
+#: actions/ostatusinit.php:41
+msgid "You can use the local subscription!"
msgstr ""
-#: OStatusPlugin.php:487
-msgid "Could not set up remote group membership."
+#: actions/ostatusinit.php:63
+msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: OStatusPlugin.php:504
+#: actions/ostatusinit.php:95
#, php-format
-msgid "%s has joined group %s."
+msgid "Join group %s"
msgstr ""
-#: OStatusPlugin.php:512
-msgid "Failed joining remote group."
+#: actions/ostatusinit.php:98
+#, php-format
+msgid "Subscribe to %s"
msgstr ""
-#: OStatusPlugin.php:553
-msgid "Leave"
+#: actions/ostatusinit.php:111
+msgid "User nickname"
msgstr ""
-#: OStatusPlugin.php:554
-#, php-format
-msgid "%s has left group %s."
+#: actions/ostatusinit.php:112
+msgid "Nickname of the user you want to follow"
msgstr ""
-#: OStatusPlugin.php:685
-msgid "Subscribe to remote user"
+#: actions/ostatusinit.php:116
+msgid "Profile Account"
msgstr ""
-#: OStatusPlugin.php:726
-msgid "Profile update"
+#: actions/ostatusinit.php:117
+msgid "Your account id (i.e. user@identi.ca)"
msgstr ""
-#: OStatusPlugin.php:727
-#, php-format
-msgid "%s has updated their profile page."
+#: actions/ostatusinit.php:138
+msgid "Must provide a remote profile."
msgstr ""
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
+#: actions/ostatusinit.php:149
+msgid "Couldn't look up OStatus account profile."
+msgstr ""
+
+#: actions/ostatusinit.php:161
+msgid "Couldn't confirm remote profile address."
+msgstr ""
+
+#: actions/ostatusinit.php:202
+msgid "OStatus Connect"
msgstr ""
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
deleted file mode 100644
index 0956d2f9b..000000000
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ /dev/null
@@ -1,109 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 14:14-0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: FeedSubPlugin.php:77
-msgid "Feeds"
-msgstr "Flux"
-
-#: FeedSubPlugin.php:78
-msgid "Feed subscription options"
-msgstr "Préférences pour abonnement flux"
-
-#: feedmunger.php:215
-#, php-format
-msgid "New post: \"%1$s\" %2$s"
-msgstr "Nouveau: \"%1$s\" %2$s"
-
-#: actions/feedsubsettings.php:41
-msgid "Feed subscriptions"
-msgstr "Abonnements aux fluxes"
-
-#: actions/feedsubsettings.php:52
-msgid ""
-"You can subscribe to feeds from other sites; updates will appear in your "
-"personal timeline."
-msgstr ""
-"Abonner aux fluxes RSS ou Atom des autres sites web; les temps se trouverair"
-"en votre flux personnel."
-
-#: actions/feedsubsettings.php:96
-msgid "Subscribe"
-msgstr "Abonner"
-
-#: actions/feedsubsettings.php:98
-msgid "Continue"
-msgstr "Prochaine"
-
-#: actions/feedsubsettings.php:151
-msgid "Empty feed URL!"
-msgstr ""
-
-#: actions/feedsubsettings.php:161
-msgid "Invalid URL or could not reach server."
-msgstr ""
-
-#: actions/feedsubsettings.php:164
-msgid "Cannot read feed; server returned error."
-msgstr ""
-
-#: actions/feedsubsettings.php:167
-msgid "Cannot read feed; server returned an empty page."
-msgstr ""
-
-#: actions/feedsubsettings.php:170
-msgid "Bad HTML, could not find feed link."
-msgstr ""
-
-#: actions/feedsubsettings.php:173
-msgid "Could not find a feed linked from this URL."
-msgstr ""
-
-#: actions/feedsubsettings.php:176
-msgid "Not a recognized feed type."
-msgstr ""
-
-#: actions/feedsubsettings.php:180
-msgid "Bad feed URL."
-msgstr ""
-
-#: actions/feedsubsettings.php:188
-msgid "Feed is not PuSH-enabled; cannot subscribe."
-msgstr ""
-
-#: actions/feedsubsettings.php:208
-msgid "Feed subscription failed! Bad response from hub."
-msgstr ""
-
-#: actions/feedsubsettings.php:218
-msgid "Already subscribed!"
-msgstr ""
-
-#: actions/feedsubsettings.php:220
-msgid "Feed subscribed!"
-msgstr ""
-
-#: actions/feedsubsettings.php:222
-msgid "Feed subscription failed!"
-msgstr ""
-
-#: actions/feedsubsettings.php:231
-msgid "Previewing feed:"
-msgstr ""
-
-msgid "Confirm"
-msgstr "Confirmer"
diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php
new file mode 100644
index 000000000..121d12109
--- /dev/null
+++ b/plugins/OStatus/scripts/resub-feed.php
@@ -0,0 +1,74 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$helptext = <<<END_OF_HELP
+resub-feed.php [options] http://example.com/atom-feed-url
+Reinitialize the PuSH subscription for the given feed. This may help get
+things restarted if we and the hub have gotten our states out of sync.
+
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (empty($args[0]) || !Validate::uri($args[0])) {
+ print "$helptext";
+ exit(1);
+}
+
+$feedurl = $args[0];
+
+
+$sub = FeedSub::staticGet('topic', $feedurl);
+if (!$sub) {
+ print "Feed $feedurl is not subscribed.\n";
+ exit(1);
+}
+
+print "Old state:\n";
+showSub($sub);
+
+print "\n";
+print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
+$ok = $sub->subscribe();
+
+if ($ok) {
+ print "ok\n";
+} else {
+ print "Could not confirm.\n";
+}
+
+$sub2 = FeedSub::staticGet('topic', $feedurl);
+
+print "\n";
+print "New state:\n";
+showSub($sub2);
+
+function showSub($sub)
+{
+ print " Subscription state: $sub->sub_state\n";
+ print " Verify token: $sub->verify_token\n";
+ print " Signature secret: $sub->secret\n";
+ print " Sub start date: $sub->sub_start\n";
+ print " Record created: $sub->created\n";
+ print " Record modified: $sub->modified\n";
+}
diff --git a/plugins/OStatus/scripts/update-profile.php b/plugins/OStatus/scripts/update-profile.php
new file mode 100644
index 000000000..d06de4f90
--- /dev/null
+++ b/plugins/OStatus/scripts/update-profile.php
@@ -0,0 +1,147 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$helptext = <<<END_OF_HELP
+update-profile.php [options] http://example.com/profile/url
+
+Rerun profile and feed info discovery for the given OStatus remote profile,
+and reinitialize its PuSH subscription for the given feed. This may help get
+things restarted if the hub or feed URLs have changed for the profile.
+
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (empty($args[0]) || !Validate::uri($args[0])) {
+ print "$helptext";
+ exit(1);
+}
+
+$uri = $args[0];
+
+
+$oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+if (!$oprofile) {
+ print "No OStatus remote profile known for URI $uri\n";
+ exit(1);
+}
+
+print "Old profile state for $oprofile->uri\n";
+showProfile($oprofile);
+
+print "\n";
+print "Re-running feed discovery for profile URL $oprofile->uri\n";
+// @fixme will bork where the URI isn't the profile URL for now
+$discover = new FeedDiscovery();
+$feedurl = $discover->discoverFromURL($oprofile->uri);
+$huburi = $discover->getAtomLink('hub');
+$salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+
+print " Feed URL: $feedurl\n";
+print " Hub URL: $huburi\n";
+print " Salmon URL: $salmonuri\n";
+
+if ($feedurl != $oprofile->feeduri || $salmonuri != $oprofile->salmonuri) {
+ print "\n";
+ print "Updating...\n";
+ // @fixme update keys :P
+ #$orig = clone($oprofile);
+ #$oprofile->feeduri = $feedurl;
+ #$oprofile->salmonuri = $salmonuri;
+ #$ok = $oprofile->update($orig);
+ $ok = $oprofile->query('UPDATE ostatus_profile SET ' .
+ 'feeduri=\'' . $oprofile->escape($feedurl) . '\',' .
+ 'salmonuri=\'' . $oprofile->escape($salmonuri) . '\' ' .
+ 'WHERE uri=\'' . $oprofile->escape($uri) . '\'');
+
+ if (!$ok) {
+ print "Failed to update profile record...\n";
+ exit(1);
+ }
+
+ $oprofile->decache();
+} else {
+ print "\n";
+ print "Ok, ostatus_profile record unchanged.\n\n";
+}
+
+$sub = FeedSub::ensureFeed($feedurl);
+
+if ($huburi != $sub->huburi) {
+ print "\n";
+ print "Updating hub record for feed; was $sub->huburi\n";
+ $orig = clone($sub);
+ $sub->huburi = $huburi;
+ $ok = $sub->update($orig);
+
+ if (!$ok) {
+ print "Failed to update sub record...\n";
+ exit(1);
+ }
+} else {
+ print "\n";
+ print "Feed record ok, not changing.\n\n";
+}
+
+print "\n";
+print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
+$ok = $sub->subscribe();
+
+if ($ok) {
+ print "ok\n";
+} else {
+ print "Could not confirm.\n";
+}
+
+$o2 = Ostatus_profile::staticGet('uri', $uri);
+
+print "\n";
+print "New profile state:\n";
+showProfile($o2);
+
+print "\n";
+print "New feed state:\n";
+$sub2 = FeedSub::ensureFeed($feedurl);
+showSub($sub2);
+
+function showProfile($oprofile)
+{
+ print " Feed URL: $oprofile->feeduri\n";
+ print " Salmon URL: $oprofile->salmonuri\n";
+ print " Avatar URL: $oprofile->avatar\n";
+ print " Profile ID: $oprofile->profile_id\n";
+ print " Group ID: $oprofile->group_id\n";
+ print " Record created: $oprofile->created\n";
+ print " Record modified: $oprofile->modified\n";
+}
+
+function showSub($sub)
+{
+ print " Subscription state: $sub->sub_state\n";
+ print " Verify token: $sub->verify_token\n";
+ print " Signature secret: $sub->secret\n";
+ print " Sub start date: $sub->sub_start\n";
+ print " Record created: $sub->created\n";
+ print " Record modified: $sub->modified\n";
+}
diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
new file mode 100644
index 000000000..f9bd4af10
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: OpenExternalLinkTargetPlugin.php:60
+msgid "Opens external links (i.e., with rel=external) on a new window or tab"
+msgstr ""
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 270e2c624..7d6a5dc00 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -20,7 +20,9 @@
* @category Plugin
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -38,6 +40,8 @@ if (!defined('STATUSNET')) {
* @category Plugin
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
* @link http://openid.net/
@@ -45,7 +49,19 @@ if (!defined('STATUSNET')) {
class OpenIDPlugin extends Plugin
{
- public $openidOnly = false;
+ // Plugin parameter: set true to disallow non-OpenID logins
+ // If set, overrides the setting in database or $config['site']['openidonly']
+ public $openidOnly = null;
+
+ function initialize()
+ {
+ parent::initialize();
+ if ($this->openidOnly !== null) {
+ global $config;
+ $config['site']['openidonly'] = (bool)$this->openidOnly;
+ }
+
+ }
/**
* Add OpenID-related paths to the router table
@@ -67,6 +83,7 @@ class OpenIDPlugin extends Plugin
$m->connect('index.php?action=finishaddopenid',
array('action' => 'finishaddopenid'));
$m->connect('main/openidserver', array('action' => 'openidserver'));
+ $m->connect('admin/openid', array('action' => 'openidadminpanel'));
return true;
}
@@ -84,7 +101,7 @@ class OpenIDPlugin extends Plugin
function onStartConnectPath(&$path, &$defaults, &$rules, &$result)
{
- if ($this->openidOnly) {
+ if (common_config('site', 'openidonly')) {
static $block = array('main/login',
'main/register',
'main/recoverpassword',
@@ -108,7 +125,7 @@ class OpenIDPlugin extends Plugin
function onArgsInitialize($args)
{
- if ($this->openidOnly) {
+ if (common_config('site', 'openidonly')) {
if (array_key_exists('action', $args)) {
$action = trim($args['action']);
if (in_array($action, array('login', 'register'))) {
@@ -199,19 +216,19 @@ class OpenIDPlugin extends Plugin
function onStartPrimaryNav($action)
{
- if ($this->openidOnly && !common_logged_in()) {
+ if (common_config('site', 'openidonly') && !common_logged_in()) {
// TRANS: Tooltip for main menu option "Login"
$tooltip = _m('TOOLTIP', 'Login to the site');
- // TRANS: Main menu option when not logged in to log in
$action->menuItem(common_local_url('openidlogin'),
+ // TRANS: Main menu option when not logged in to log in
_m('MENU', 'Login'),
$tooltip,
false,
'nav_login');
// TRANS: Tooltip for main menu option "Help"
$tooltip = _m('TOOLTIP', 'Help me!');
- // TRANS: Main menu option for help on the StatusNet site
$action->menuItem(common_local_url('doc', array('title' => 'help')),
+ // TRANS: Main menu option for help on the StatusNet site
_m('MENU', 'Help'),
$tooltip,
false,
@@ -219,8 +236,8 @@ class OpenIDPlugin extends Plugin
if (!common_config('site', 'private')) {
// TRANS: Tooltip for main menu option "Search"
$tooltip = _m('TOOLTIP', 'Search for people or text');
- // TRANS: Main menu option when logged in or when the StatusNet instance is not private
$action->menuItem(common_local_url('peoplesearch'),
+ // TRANS: Main menu option when logged in or when the StatusNet instance is not private
_m('MENU', 'Search'), $tooltip, false, 'nav_search');
}
Event::handle('EndPrimaryNav', array($action));
@@ -241,7 +258,7 @@ class OpenIDPlugin extends Plugin
function onStartLoginGroupNav(&$action)
{
- if ($this->openidOnly) {
+ if (common_config('site', 'openidonly')) {
$this->showOpenIDLoginTab($action);
// Even though we replace this code, we
// DON'T run the End* hook, to keep others from
@@ -280,7 +297,9 @@ class OpenIDPlugin extends Plugin
$action_name = $action->trimmed('action');
$action->menuItem(common_local_url('openidlogin'),
- _m('OpenID'),
+ // TRANS: OpenID plugin menu item on site logon page.
+ _m('MENU', 'OpenID'),
+ // TRANS: OpenID plugin tooltip for logon menu item.
_m('Login or register with OpenID'),
$action_name === 'openidlogin');
}
@@ -297,7 +316,7 @@ class OpenIDPlugin extends Plugin
*/
function onStartAccountSettingsPasswordMenuItem($menu, &$unused) {
- if ($this->openidOnly) {
+ if (common_config('site', 'openidonly')) {
return false;
}
return true;
@@ -316,7 +335,9 @@ class OpenIDPlugin extends Plugin
$action_name = $action->trimmed('action');
$action->menuItem(common_local_url('openidsettings'),
- _m('OpenID'),
+ // TRANS: OpenID plugin menu item on user settings page.
+ _m('MENU', 'OpenID'),
+ // TRANS: OpenID plugin tooltip for user settings menu item.
_m('Add or remove OpenIDs'),
$action_name === 'openidsettings');
@@ -345,13 +366,19 @@ class OpenIDPlugin extends Plugin
case 'OpenidsettingsAction':
case 'OpenidserverAction':
case 'OpenidtrustAction':
- require_once INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+ case 'OpenidadminpanelAction':
+ require_once dirname(__FILE__) . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
return false;
case 'User_openid':
- require_once INSTALLDIR.'/plugins/OpenID/User_openid.php';
+ require_once dirname(__FILE__) . '/User_openid.php';
return false;
case 'User_openid_trustroot':
- require_once INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php';
+ require_once dirname(__FILE__) . '/User_openid_trustroot.php';
+ return false;
+ case 'Auth_OpenID_TeamsExtension':
+ case 'Auth_OpenID_TeamsRequest':
+ case 'Auth_OpenID_TeamsResponse':
+ require_once dirname(__FILE__) . '/extlib/teams-extension.php';
return false;
default:
return true;
@@ -442,7 +469,7 @@ class OpenIDPlugin extends Plugin
function onRedirectToLogin($action, $user)
{
- if ($this->openidOnly || (!empty($user) && User_openid::hasOpenID($user->id))) {
+ if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) {
common_redirect(common_local_url('openidlogin'), 303);
return false;
}
@@ -578,6 +605,32 @@ class OpenIDPlugin extends Plugin
}
/**
+ * Add an OpenID tab to the admin panel
+ *
+ * @param Widget $nav Admin panel nav
+ *
+ * @return boolean hook value
+ */
+
+ function onEndAdminPanelNav($nav)
+ {
+ if (AdminPanelAction::canAdmin('openid')) {
+
+ $action_name = $nav->action->trimmed('action');
+
+ $nav->out->menuItem(
+ common_local_url('openidadminpanel'),
+ _m('OpenID'),
+ _m('OpenID configuration'),
+ $action_name == 'openidadminpanel',
+ 'nav_openid_admin_panel'
+ );
+ }
+
+ return true;
+ }
+
+ /**
* Add our version information to output
*
* @param array &$versions Array of version-data arrays
@@ -592,6 +645,7 @@ class OpenIDPlugin extends Plugin
'author' => 'Evan Prodromou, Craig Andrews',
'homepage' => 'http://status.net/wiki/Plugin:OpenID',
'rawdescription' =>
+ // TRANS: OpenID plugin description.
_m('Use <a href="http://openid.net/">OpenID</a> to login to the site.'));
return true;
}
diff --git a/plugins/OpenID/extlib/README b/plugins/OpenID/extlib/README
new file mode 100644
index 000000000..1fe80d79b
--- /dev/null
+++ b/plugins/OpenID/extlib/README
@@ -0,0 +1,6 @@
+team-extension.php
+ Support for Launchpad's OpenID Teams extension
+ Maintainer: Canonical
+ Source: https://code.edge.launchpad.net/wordpress-teams-integration
+ r27 2010-04-27
+ License: AGPLv3
diff --git a/plugins/OpenID/extlib/teams-extension.php b/plugins/OpenID/extlib/teams-extension.php
new file mode 100644
index 000000000..451f2fb19
--- /dev/null
+++ b/plugins/OpenID/extlib/teams-extension.php
@@ -0,0 +1,175 @@
+<?php
+/*
+ * Wordpress Teams plugin
+ * Copyright (C) 2009-2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides an example OpenID extension to query user team/group membership
+ *
+ * This code is based on code supplied with the openid library for simple
+ * registration data.
+ */
+
+/**
+ * Require the Message implementation.
+ */
+require_once 'Auth/OpenID/Message.php';
+require_once 'Auth/OpenID/Extension.php';
+
+/**
+ * The team/group extension base class
+ */
+class Auth_OpenID_TeamsExtension extends Auth_OpenID_Extension {
+ var $ns_uri = 'http://ns.launchpad.net/2007/openid-teams';
+ var $ns_alias = 'lp';
+ var $request_field = 'query_membership';
+ var $response_field = 'is_member';
+
+ /**
+ * Get the string arguments that should be added to an OpenID
+ * message for this extension.
+ */
+ function getExtensionArgs() {
+ $args = array();
+
+ if ($this->_teams) {
+ $args[$this->request_field] = implode(',', $this->_teams);
+ }
+
+ return $args;
+ }
+
+ /**
+ * Add the arguments from this extension to the provided message.
+ *
+ * Returns the message with the extension arguments added.
+ */
+ function toMessage(&$message) {
+ if ($message->namespaces->addAlias($this->ns_uri, $this->ns_alias) === null) {
+ if ($message->namespaces->getAlias($this->ns_uri) != $this->ns_alias) {
+ return null;
+ }
+ }
+
+ $message->updateArgs($this->ns_uri, $this->getExtensionArgs());
+ return $message;
+ }
+
+ /**
+ * Extract the team/group namespace URI from the given OpenID message.
+ * Handles OpenID 1 and 2.
+ *
+ * $message: The OpenID message from which to parse team/group data.
+ * This may be a request or response message.
+ *
+ * Returns the sreg namespace URI for the supplied message.
+ *
+ * @access private
+ */
+ function _getExtensionNS(&$message) {
+ $alias = null;
+ $found_ns_uri = null;
+
+ // See if there exists an alias for the namespace
+ $alias = $message->namespaces->getAlias($this->ns_uri);
+
+ if ($alias !== null) {
+ $found_ns_uri = $this->ns_uri;
+ }
+
+ if ($alias === null) {
+ // There is no alias for this extension, so try to add one.
+ $found_ns_uri = Auth_OpenID_TYPE_1_0;
+
+ if ($message->namespaces->addAlias($this->ns_uri, $this->ns_alias) === null) {
+ // An alias for the string 'lp' already exists, but
+ // it's defined for something other than team/group membership
+ return null;
+ }
+ }
+
+ return $found_ns_uri;
+ }
+}
+
+/**
+ * The team/group extension request class
+ */
+class Auth_OpenID_TeamsRequest extends Auth_OpenID_TeamsExtension {
+ function __init($teams) {
+ if (!is_array($teams)) {
+ if (!empty($teams)) {
+ $teams = explode(',', $teams);
+ } else {
+ $teams = Array();
+ }
+ }
+
+ $this->_teams = $teams;
+ }
+
+ function Auth_OpenID_TeamsRequest($teams) {
+ $this->__init($teams);
+ }
+}
+
+/**
+ * The team/group extension response class
+ */
+class Auth_OpenID_TeamsResponse extends Auth_OpenID_TeamsExtension {
+ var $_teams = array();
+
+ function __init(&$resp, $signed_only=true) {
+ $this->ns_uri = $this->_getExtensionNS($resp->message);
+
+ if ($signed_only) {
+ $args = $resp->getSignedNS($this->ns_uri);
+ } else {
+ $args = $resp->message->getArgs($this->ns_uri);
+ }
+
+ if ($args === null) {
+ return null;
+ }
+
+ // An OpenID 2.0 response will handle the namespaces
+ if (in_array($this->response_field, array_keys($args)) && !empty($args[$this->response_field])) {
+ $this->_teams = explode(',', $args[$this->response_field]);
+ }
+
+ // Piggybacking on a 1.x request, however, won't so the field name will
+ // be different
+ elseif (in_array($this->ns_alias.'.'.$this->response_field, array_keys($args)) && !empty($args[$this->ns_alias.'.'.$this->response_field])) {
+ $this->_teams = explode(',', $args[$this->ns_alias.'.'.$this->response_field]);
+ }
+ }
+
+ function Auth_OpenID_TeamsResponse(&$resp, $signed_only=true) {
+ $this->__init($resp, $signed_only);
+ }
+
+ /**
+ * Get the array of teams the user is a member of
+ *
+ * @return array
+ */
+ function getTeams() {
+ return $this->_teams;
+ }
+}
+
+?>
diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
index 991e6584e..47b3f7fb1 100644
--- a/plugins/OpenID/finishaddopenid.php
+++ b/plugins/OpenID/finishaddopenid.php
@@ -64,6 +64,7 @@ class FinishaddopenidAction extends Action
{
parent::handle($args);
if (!common_logged_in()) {
+ // TRANS: Client error message
$this->clientError(_m('Not logged in.'));
} else {
$this->tryLogin();
@@ -85,10 +86,12 @@ class FinishaddopenidAction extends Action
$response = $consumer->complete(common_local_url('finishaddopenid'));
if ($response->status == Auth_OpenID_CANCEL) {
+ // TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
$this->message(_m('OpenID authentication cancelled.'));
return;
} else if ($response->status == Auth_OpenID_FAILURE) {
- // Authentication failed; display the error message.
+ // TRANS: OpenID authentication failed; display the error message.
+ // TRANS: %s is the error message.
$this->message(sprintf(_m('OpenID authentication failed: %s'),
$response->message));
} else if ($response->status == Auth_OpenID_SUCCESS) {
@@ -103,14 +106,22 @@ class FinishaddopenidAction extends Action
$sreg = $sreg_resp->contents();
}
+ // Launchpad teams extension
+ if (!oid_check_teams($response)) {
+ $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.'));
+ return;
+ }
+
$cur = common_current_user();
$other = oid_get_user($canonical);
if ($other) {
if ($other->id == $cur->id) {
+ // TRANS: message in case a user tries to add an OpenID that is already connected to them.
$this->message(_m('You already have this OpenID!'));
} else {
+ // TRANS: message in case a user tries to add an OpenID that is already used by another user.
$this->message(_m('Someone else already has this OpenID.'));
}
return;
@@ -123,15 +134,20 @@ class FinishaddopenidAction extends Action
$result = oid_link_user($cur->id, $canonical, $display);
if (!$result) {
+ // TRANS: message in case the OpenID object cannot be connected to the user.
$this->message(_m('Error connecting user.'));
return;
}
- if ($sreg) {
- if (!oid_update_user($cur, $sreg)) {
- $this->message(_m('Error updating profile'));
- return;
+ if (Event::handle('StartOpenIDUpdateUser', array($cur, $canonical, &$sreg))) {
+ if ($sreg) {
+ if (!oid_update_user($cur, $sreg)) {
+ // TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+ $this->message(_m('Error updating profile'));
+ return;
+ }
}
}
+ Event::handle('EndOpenIDUpdateUser', array($cur, $canonical, $sreg));
// success!
@@ -167,6 +183,7 @@ class FinishaddopenidAction extends Action
function title()
{
+ // TRANS: Title after getting the status of the OpenID authorisation request.
return _m('OpenID Login');
}
diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 32b092a0b..0c03b5c4d 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -31,15 +31,18 @@ class FinishopenidloginAction extends Action
{
parent::handle($args);
if (common_is_real_login()) {
+ // TRANS: Client error message trying to log on with OpenID while already logged on.
$this->clientError(_m('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
+ // TRANS: Message given when there is a problem with the user's session token.
$this->showForm(_m('There was a problem with your session token. Try again, please.'));
return;
}
if ($this->arg('create')) {
if (!$this->boolean('license')) {
+ // TRANS: Message given if user does not agree with the site's license.
$this->showForm(_m('You can\'t register if you don\'t agree to the license.'),
$this->trimmed('newname'));
return;
@@ -48,7 +51,8 @@ class FinishopenidloginAction extends Action
} else if ($this->arg('connect')) {
$this->connectUser();
} else {
- $this->showForm(_m('Something weird happened.'),
+ // TRANS: Messag given on an unknown error.
+ $this->showForm(_m('An unknown error has occured.'),
$this->trimmed('newname'));
}
} else {
@@ -62,12 +66,15 @@ class FinishopenidloginAction extends Action
$this->element('div', array('class' => 'error'), $this->error);
} else {
$this->element('div', 'instructions',
+ // TRANS: Instructions given after a first successful logon using OpenID.
+ // TRANS: %s is the site name.
sprintf(_m('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
}
}
function title()
{
+ // TRANS: Title
return _m('OpenID Account Setup');
}
@@ -115,6 +122,8 @@ class FinishopenidloginAction extends Action
'value' => 'true'));
$this->elementStart('label', array('for' => 'license',
'class' => 'checkbox'));
+ // TRANS: OpenID plugin link text.
+ // TRANS: %s is a link to a licese with the license name as link text.
$message = _('My text and files are available under %s ' .
'except this private data: password, ' .
'email address, IM address, and phone number.');
@@ -127,23 +136,29 @@ class FinishopenidloginAction extends Action
$this->elementEnd('label');
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('create', _m('Create'));
+ // TRANS: Button label in form in which to create a new user on the site for an OpenID.
+ $this->submit('create', _m('BUTTON', 'Create'));
$this->elementEnd('fieldset');
$this->elementStart('fieldset', array('id' => 'form_openid_createaccount'));
$this->element('legend', null,
+ // TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
_m('Connect existing account'));
$this->element('p', null,
+ // TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
_m('If you already have an account, login with your username and password to connect it to your OpenID.'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
$this->input('nickname', _m('Existing nickname'));
$this->elementEnd('li');
$this->elementStart('li');
+ // TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
$this->password('password', _m('Password'));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('connect', _m('Connect'));
+ // TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+ $this->submit('connect', _m('BUTTON', 'Connect'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
@@ -155,10 +170,11 @@ class FinishopenidloginAction extends Action
$response = $consumer->complete(common_local_url('finishopenidlogin'));
if ($response->status == Auth_OpenID_CANCEL) {
+ // TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
$this->message(_m('OpenID authentication cancelled.'));
return;
} else if ($response->status == Auth_OpenID_FAILURE) {
- // Authentication failed; display the error message.
+ // TRANS: OpenID authentication failed; display the error message. %s is the error message.
$this->message(sprintf(_m('OpenID authentication failed: %s'), $response->message));
} else if ($response->status == Auth_OpenID_SUCCESS) {
// This means the authentication succeeded; extract the
@@ -177,6 +193,12 @@ class FinishopenidloginAction extends Action
$sreg = $sreg_resp->contents();
}
+ // Launchpad teams extension
+ if (!oid_check_teams($response)) {
+ $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.'));
+ return;
+ }
+
$user = oid_get_user($canonical);
if ($user) {
@@ -224,6 +246,7 @@ class FinishopenidloginAction extends Action
# FIXME: save invite code before redirect, and check here
if (common_config('site', 'closed')) {
+ // TRANS: OpenID plugin message. No new user registration is allowed on the site.
$this->clientError(_m('Registration not allowed.'));
return;
}
@@ -233,6 +256,7 @@ class FinishopenidloginAction extends Action
if (common_config('site', 'inviteonly')) {
$code = $_SESSION['invitecode'];
if (empty($code)) {
+ // TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
$this->clientError(_m('Registration not allowed.'));
return;
}
@@ -240,6 +264,7 @@ class FinishopenidloginAction extends Action
$invite = Invitation::staticGet($code);
if (empty($invite)) {
+ // TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
$this->clientError(_m('Not a valid invitation code.'));
return;
}
@@ -250,16 +275,19 @@ class FinishopenidloginAction extends Action
if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => NICKNAME_FMT))) {
+ // TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
$this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
}
if (!User::allowed_nickname($nickname)) {
+ // TRANS: OpenID plugin message. The entered new user name is blacklisted.
$this->showForm(_m('Nickname not allowed.'));
return;
}
if (User::staticGet('nickname', $nickname)) {
+ // TRANS: OpenID plugin message. The entered new user name is already used.
$this->showForm(_m('Nickname already in use. Try another one.'));
return;
}
@@ -267,6 +295,7 @@ class FinishopenidloginAction extends Action
list($display, $canonical, $sreg) = $this->getSavedValues();
if (!$display || !$canonical) {
+ // TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
$this->serverError(_m('Stored OpenID not found.'));
return;
}
@@ -276,10 +305,13 @@ class FinishopenidloginAction extends Action
$other = oid_get_user($canonical);
if ($other) {
+ // TRANS: OpenID plugin server error.
$this->serverError(_m('Creating new account for OpenID that already has a user.'));
return;
}
+ Event::handle('StartOpenIDCreateNewUser', array($canonical, &$sreg));
+
$location = '';
if (!empty($sreg['country'])) {
if ($sreg['postcode']) {
@@ -319,6 +351,8 @@ class FinishopenidloginAction extends Action
$result = oid_link_user($user->id, $canonical, $display);
+ Event::handle('EndOpenIDCreateNewUser', array($user, $canonical, $sreg));
+
oid_set_last($display);
common_set_user($user);
common_real_login(true);
@@ -336,6 +370,7 @@ class FinishopenidloginAction extends Action
$password = $this->trimmed('password');
if (!common_check_user($nickname, $password)) {
+ // TRANS: OpenID plugin message.
$this->showForm(_m('Invalid username or password.'));
return;
}
@@ -347,6 +382,7 @@ class FinishopenidloginAction extends Action
list($display, $canonical, $sreg) = $this->getSavedValues();
if (!$display || !$canonical) {
+ // TRANS: OpenID plugin server error. A stored OpenID cannot be found.
$this->serverError(_m('Stored OpenID not found.'));
return;
}
@@ -354,11 +390,16 @@ class FinishopenidloginAction extends Action
$result = oid_link_user($user->id, $canonical, $display);
if (!$result) {
+ // TRANS: OpenID plugin server error. The user or user profile could not be saved.
$this->serverError(_m('Error connecting user to OpenID.'));
return;
}
- oid_update_user($user, $sreg);
+ if (Event::handle('StartOpenIDUpdateUser', array($user, $canonical, &$sreg))) {
+ oid_update_user($user, $sreg);
+ }
+ Event::handle('EndOpenIDUpdateUser', array($user, $canonical, $sreg));
+
oid_set_last($display);
common_set_user($user);
common_real_login(true);
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 7ed879835..70908422e 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,311 +16,347 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: finishaddopenid.php:67
-msgid "Not logged in."
+#: openidsettings.php:59
+msgid "OpenID settings"
msgstr ""
-#: finishaddopenid.php:88 finishopenidlogin.php:149
-msgid "OpenID authentication cancelled."
+#: openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
msgstr ""
-#: finishaddopenid.php:92 finishopenidlogin.php:153
-#, php-format
-msgid "OpenID authentication failed: %s"
+#: openidsettings.php:99
+msgid "Add OpenID"
msgstr ""
-#: finishaddopenid.php:112
-msgid "You already have this OpenID!"
+#: openidsettings.php:102
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
msgstr ""
-#: finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
+#: openidsettings.php:107 openidlogin.php:119
+msgid "OpenID URL"
msgstr ""
-#: finishaddopenid.php:126
-msgid "Error connecting user."
+#: openidsettings.php:117
+msgid "Add"
msgstr ""
-#: finishaddopenid.php:131
-msgid "Error updating profile"
+#: openidsettings.php:129
+msgid "Remove OpenID"
msgstr ""
-#: finishaddopenid.php:170 openidlogin.php:95
-msgid "OpenID Login"
+#: openidsettings.php:134
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
msgstr ""
-#: finishopenidlogin.php:34 openidlogin.php:30
-msgid "Already logged in."
+#: openidsettings.php:149
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
msgstr ""
-#: finishopenidlogin.php:38 openidlogin.php:37 openidsettings.php:194
-msgid "There was a problem with your session token. Try again, please."
+#: openidsettings.php:172 openidsettings.php:213
+msgid "Remove"
msgstr ""
-#: finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
+#: openidsettings.php:186
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:189
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
msgstr ""
-#: finishopenidlogin.php:52 openidsettings.php:208
+#: openidsettings.php:231 finishopenidlogin.php:38 openidlogin.php:39
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:247 finishopenidlogin.php:51
msgid "Something weird happened."
msgstr ""
-#: finishopenidlogin.php:66
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
+#: openidsettings.php:271
+msgid "No such OpenID trustroot."
msgstr ""
-#: finishopenidlogin.php:72
-msgid "OpenID Account Setup"
+#: openidsettings.php:275
+msgid "Trustroots removed"
msgstr ""
-#: finishopenidlogin.php:97
-msgid "Create new account"
+#: openidsettings.php:298
+msgid "No such OpenID."
msgstr ""
-#: finishopenidlogin.php:99
-msgid "Create a new user with this nickname."
+#: openidsettings.php:303
+msgid "That OpenID does not belong to you."
msgstr ""
-#: finishopenidlogin.php:102
-msgid "New nickname"
+#: openidsettings.php:307
+msgid "OpenID removed."
msgstr ""
-#: finishopenidlogin.php:104
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#: openid.php:137
+msgid "Cannot instantiate OpenID consumer object."
msgstr ""
-#: finishopenidlogin.php:114
-msgid "My text and files are available under "
+#: openid.php:147
+msgid "Not a valid OpenID."
msgstr ""
-#: finishopenidlogin.php:117
-msgid ""
-" except this private data: password, email address, IM address, phone number."
+#: openid.php:149
+#, php-format
+msgid "OpenID failure: %s"
msgstr ""
-#: finishopenidlogin.php:121
-msgid "Create"
+#: openid.php:176
+#, php-format
+msgid "Could not redirect to server: %s"
msgstr ""
-#: finishopenidlogin.php:126
-msgid "Connect existing account"
+#: openid.php:194
+#, php-format
+msgid "Could not create OpenID form: %s"
msgstr ""
-#: finishopenidlogin.php:128
+#: openid.php:210
msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
msgstr ""
-#: finishopenidlogin.php:131
-msgid "Existing nickname"
+#: openid.php:242
+msgid "Error saving the profile."
msgstr ""
-#: finishopenidlogin.php:134
-msgid "Password"
+#: openid.php:253
+msgid "Error saving the user."
msgstr ""
-#: finishopenidlogin.php:137
-msgid "Connect"
+#: openid.php:282
+msgid "Unauthorized URL used for OpenID login."
msgstr ""
-#: finishopenidlogin.php:215 finishopenidlogin.php:224
-msgid "Registration not allowed."
+#: openid.php:302
+msgid "OpenID Login Submission"
msgstr ""
-#: finishopenidlogin.php:231
-msgid "Not a valid invitation code."
+#: openid.php:312
+msgid "Requesting authorization from your login provider..."
msgstr ""
-#: finishopenidlogin.php:241
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: openid.php:315
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
msgstr ""
-#: finishopenidlogin.php:246
-msgid "Nickname not allowed."
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:204
+msgctxt "TOOLTIP"
+msgid "Login to the site"
msgstr ""
-#: finishopenidlogin.php:251
-msgid "Nickname already in use. Try another one."
+#: OpenIDPlugin.php:207
+msgctxt "MENU"
+msgid "Login"
msgstr ""
-#: finishopenidlogin.php:258 finishopenidlogin.php:338
-msgid "Stored OpenID not found."
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:212
+msgctxt "TOOLTIP"
+msgid "Help me!"
msgstr ""
-#: finishopenidlogin.php:267
-msgid "Creating new account for OpenID that already has a user."
+#: OpenIDPlugin.php:215
+msgctxt "MENU"
+msgid "Help"
msgstr ""
-#: finishopenidlogin.php:327
-msgid "Invalid username or password."
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:221
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
msgstr ""
-#: finishopenidlogin.php:345
-msgid "Error connecting user to OpenID."
+#: OpenIDPlugin.php:224
+msgctxt "MENU"
+msgid "Search"
msgstr ""
-#: openid.php:141
-msgid "Cannot instantiate OpenID consumer object."
+#: OpenIDPlugin.php:283 OpenIDPlugin.php:319
+msgid "OpenID"
msgstr ""
-#: openid.php:151
-msgid "Not a valid OpenID."
+#: OpenIDPlugin.php:284
+msgid "Login or register with OpenID"
msgstr ""
-#: openid.php:153
-#, php-format
-msgid "OpenID failure: %s"
+#: OpenIDPlugin.php:320
+msgid "Add or remove OpenIDs"
msgstr ""
-#: openid.php:180
-#, php-format
-msgid "Could not redirect to server: %s"
+#: OpenIDPlugin.php:595
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
msgstr ""
-#: openid.php:198
+#: openidserver.php:106
#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: openid.php:214
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+msgid "You are not authorized to use the identity %s."
msgstr ""
-#: openid.php:246
-msgid "Error saving the profile."
+#: openidserver.php:126
+msgid "Just an OpenID provider. Nothing to see here, move along..."
msgstr ""
-#: openid.php:257
-msgid "Error saving the user."
+#: finishopenidlogin.php:34 openidlogin.php:30
+msgid "Already logged in."
msgstr ""
-#: openid.php:277
-msgid "OpenID Auto-Submit"
+#: finishopenidlogin.php:43
+msgid "You can't register if you don't agree to the license."
msgstr ""
-#: openidlogin.php:66
+#: finishopenidlogin.php:65
#, php-format
msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
msgstr ""
-#: openidlogin.php:70
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
+#: finishopenidlogin.php:71
+msgid "OpenID Account Setup"
msgstr ""
-#: openidlogin.php:112
-msgid "OpenID login"
+#: finishopenidlogin.php:101
+msgid "Create new account"
msgstr ""
-#: openidlogin.php:117 openidsettings.php:107
-msgid "OpenID URL"
+#: finishopenidlogin.php:103
+msgid "Create a new user with this nickname."
msgstr ""
-#: openidlogin.php:119
-msgid "Your OpenID URL"
+#: finishopenidlogin.php:106
+msgid "New nickname"
msgstr ""
-#: openidlogin.php:122
-msgid "Remember me"
+#: finishopenidlogin.php:108
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: openidlogin.php:123
-msgid "Automatically login in the future; not for shared computers!"
+#: finishopenidlogin.php:130
+msgid "Create"
msgstr ""
-#: openidlogin.php:127
-msgid "Login"
+#: finishopenidlogin.php:135
+msgid "Connect existing account"
msgstr ""
-#: OpenIDPlugin.php:123 OpenIDPlugin.php:135
-msgid "OpenID"
+#: finishopenidlogin.php:137
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
msgstr ""
-#: OpenIDPlugin.php:124
-msgid "Login or register with OpenID"
+#: finishopenidlogin.php:140
+msgid "Existing nickname"
msgstr ""
-#: OpenIDPlugin.php:136
-msgid "Add or remove OpenIDs"
+#: finishopenidlogin.php:143
+msgid "Password"
msgstr ""
-#: OpenIDPlugin.php:324
-msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+#: finishopenidlogin.php:146
+msgid "Connect"
msgstr ""
-#: openidserver.php:106
+#: finishopenidlogin.php:158 finishaddopenid.php:88
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#: finishopenidlogin.php:162 finishaddopenid.php:92
#, php-format
-msgid "You are not authorized to use the identity %s."
+msgid "OpenID authentication failed: %s"
msgstr ""
-#: openidserver.php:126
-msgid "Just an OpenID provider. Nothing to see here, move along..."
+#: finishopenidlogin.php:227 finishopenidlogin.php:236
+msgid "Registration not allowed."
msgstr ""
-#: openidsettings.php:59
-msgid "OpenID settings"
+#: finishopenidlogin.php:243
+msgid "Not a valid invitation code."
msgstr ""
-#: openidsettings.php:70
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+#: finishopenidlogin.php:253
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-#: openidsettings.php:99
-msgid "Add OpenID"
+#: finishopenidlogin.php:258
+msgid "Nickname not allowed."
msgstr ""
-#: openidsettings.php:102
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+#: finishopenidlogin.php:263
+msgid "Nickname already in use. Try another one."
msgstr ""
-#: openidsettings.php:117
-msgid "Add"
+#: finishopenidlogin.php:270 finishopenidlogin.php:350
+msgid "Stored OpenID not found."
msgstr ""
-#: openidsettings.php:129
-msgid "Remove OpenID"
+#: finishopenidlogin.php:279
+msgid "Creating new account for OpenID that already has a user."
msgstr ""
-#: openidsettings.php:134
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+#: finishopenidlogin.php:339
+msgid "Invalid username or password."
msgstr ""
-#: openidsettings.php:149
+#: finishopenidlogin.php:357
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#: openidlogin.php:68
+#, php-format
msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
msgstr ""
-#: openidsettings.php:172
-msgid "Remove"
+#: openidlogin.php:72
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
msgstr ""
-#: openidsettings.php:228
-msgid "No such OpenID."
+#: openidlogin.php:97 finishaddopenid.php:170
+msgid "OpenID Login"
msgstr ""
-#: openidsettings.php:233
-msgid "That OpenID does not belong to you."
+#: openidlogin.php:114
+msgid "OpenID login"
msgstr ""
-#: openidsettings.php:237
-msgid "OpenID removed."
+#: openidlogin.php:121
+msgid "Your OpenID URL"
+msgstr ""
+
+#: openidlogin.php:124
+msgid "Remember me"
+msgstr ""
+
+#: openidlogin.php:125
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#: openidlogin.php:129
+msgid "Login"
msgstr ""
#: openidtrust.php:51
@@ -332,17 +368,37 @@ msgid ""
"This page should only be reached during OpenID processing, not directly."
msgstr ""
-#: openidtrust.php:118
+#: openidtrust.php:117
#, php-format
msgid ""
"%s has asked to verify your identity. Click Continue to verify your "
"identity and login without creating a new password."
msgstr ""
-#: openidtrust.php:136
+#: openidtrust.php:135
msgid "Continue"
msgstr ""
-#: openidtrust.php:137
+#: openidtrust.php:136
msgid "Cancel"
msgstr ""
+
+#: finishaddopenid.php:67
+msgid "Not logged in."
+msgstr ""
+
+#: finishaddopenid.php:112
+msgid "You already have this OpenID!"
+msgstr ""
+
+#: finishaddopenid.php:114
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#: finishaddopenid.php:126
+msgid "Error connecting user."
+msgstr ""
+
+#: finishaddopenid.php:131
+msgid "Error updating profile"
+msgstr ""
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index ae0329376..5cda9b129 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -8,315 +8,351 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 21:42+0000\n"
-"PO-Revision-Date: 2010-04-12 00:53+0100\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: 2010-04-30 02:16+0100\n"
+"Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
"Language-Team: Dutch\n"
+"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
-"MIME-Version: 1.0\n"
-#: finishaddopenid.php:67
-msgid "Not logged in."
-msgstr "Niet aangemeld."
+#: openidsettings.php:59
+msgid "OpenID settings"
+msgstr "OpenID-instellingen"
-#: finishaddopenid.php:88
-#: finishopenidlogin.php:149
-msgid "OpenID authentication cancelled."
-msgstr "De authenticatie via OpenID is afgebroken."
+#: openidsettings.php:70
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here."
+msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren."
-#: finishaddopenid.php:92
-#: finishopenidlogin.php:153
+#: openidsettings.php:99
+msgid "Add OpenID"
+msgstr "OpenID toevoegen"
+
+#: openidsettings.php:102
+msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"."
+msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"."
+
+#: openidsettings.php:107
+#: openidlogin.php:119
+msgid "OpenID URL"
+msgstr "OpenID-URL"
+
+#: openidsettings.php:117
+msgid "Add"
+msgstr "Toevoegen"
+
+#: openidsettings.php:129
+msgid "Remove OpenID"
+msgstr "OpenID verwijderen"
+
+#: openidsettings.php:134
+msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
+msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe."
+
+#: openidsettings.php:149
+msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
+msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"."
+
+#: openidsettings.php:172
+#: openidsettings.php:213
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: openidsettings.php:186
+msgid "OpenID Trusted Sites"
+msgstr "Vertrouwde OpenID-sites"
+
+#: openidsettings.php:189
+msgid "The following sites are allowed to access your identity and log you in. You can remove a site from this list to deny it access to your OpenID."
+msgstr "De volgende sites hebben toegang tot uw indentiteit en kunnen u aanmelden. U kunt een site verwijderen uit deze lijst zodat deze niet langer toegang heeft tot uw OpenID."
+
+#: openidsettings.php:231
+#: finishopenidlogin.php:38
+#: openidlogin.php:39
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw."
+
+#: openidsettings.php:247
+#: finishopenidlogin.php:51
+msgid "Something weird happened."
+msgstr "Er is iets vreemds gebeurd."
+
+#: openidsettings.php:271
+msgid "No such OpenID trustroot."
+msgstr "Die OpenID trustroot bestaat niet."
+
+#: openidsettings.php:275
+msgid "Trustroots removed"
+msgstr "De trustroots zijn verwijderd"
+
+#: openidsettings.php:298
+msgid "No such OpenID."
+msgstr "De OpenID bestaat niet."
+
+#: openidsettings.php:303
+msgid "That OpenID does not belong to you."
+msgstr "Die OpenID is niet van u."
+
+#: openidsettings.php:307
+msgid "OpenID removed."
+msgstr "OpenID verwijderd."
+
+#: openid.php:137
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Het was niet mogelijk een OpenID-object aan te maken."
+
+#: openid.php:147
+msgid "Not a valid OpenID."
+msgstr "Geen geldige OpenID."
+
+#: openid.php:149
#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "De authenticatie via OpenID is mislukt: %s"
+msgid "OpenID failure: %s"
+msgstr "OpenID-fout: %s"
-#: finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "U hebt deze OpenID al!"
+#: openid.php:176
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Het was niet mogelijk door te verwijzen naar de server: %s"
-#: finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Iemand anders gebruikt deze OpenID al."
+#: openid.php:194
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s"
-#: finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Fout bij het verbinden met de gebruiker."
+#: openid.php:210
+msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
+msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan."
-#: finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Fout bij het bijwerken van het profiel."
+#: openid.php:242
+msgid "Error saving the profile."
+msgstr "Fout bij het opslaan van het profiel."
-#: finishaddopenid.php:170
-#: openidlogin.php:95
-msgid "OpenID Login"
+#: openid.php:253
+msgid "Error saving the user."
+msgstr "Fout bij het opslaan van de gebruiker."
+
+#: openid.php:282
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Ongeautoriseerde URL gebruikt voor aanmelden via OpenID"
+
+#: openid.php:302
+#, fuzzy
+msgid "OpenID Login Submission"
msgstr "Aanmelden via OpenID"
+#: openid.php:312
+msgid "Requesting authorization from your login provider..."
+msgstr "Bezig met het vragen van autorisatie van uw aanmeldprovider..."
+
+#: openid.php:315
+msgid "If you are not redirected to your login provider in a few seconds, try pushing the button below."
+msgstr "Als u binnen een aantal seconden niet wordt doorverwezen naar uw aanmeldprovider, klik dan op de onderstaande knop."
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:204
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "Aanmelden bij de site"
+
+#: OpenIDPlugin.php:207
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "Aanmelden"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:212
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Help me"
+
+#: OpenIDPlugin.php:215
+msgctxt "MENU"
+msgid "Help"
+msgstr "Hulp"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:221
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr "Zoeken naar mensen of tekst"
+
+#: OpenIDPlugin.php:224
+msgctxt "MENU"
+msgid "Search"
+msgstr "Zoeken"
+
+#: OpenIDPlugin.php:283
+#: OpenIDPlugin.php:319
+msgid "OpenID"
+msgstr "OpenID"
+
+#: OpenIDPlugin.php:284
+msgid "Login or register with OpenID"
+msgstr "Aanmelden of registreren met OpenID"
+
+#: OpenIDPlugin.php:320
+msgid "Add or remove OpenIDs"
+msgstr "OpenID's toevoegen of verwijderen"
+
+#: OpenIDPlugin.php:595
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr "Gebruik <a href=\"http://openid.net/\">OpenID</a> om aan te melden bij de site."
+
+#: openidserver.php:106
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "U mag de identiteit %s niet gebruiken."
+
+#: openidserver.php:126
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Gewoon een OpenID-provider. Niets te zien hier..."
+
#: finishopenidlogin.php:34
#: openidlogin.php:30
msgid "Already logged in."
msgstr "U bent al aangemeld."
-#: finishopenidlogin.php:38
-#: openidlogin.php:37
-#: openidsettings.php:194
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw."
-
#: finishopenidlogin.php:43
msgid "You can't register if you don't agree to the license."
msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie."
-#: finishopenidlogin.php:52
-#: openidsettings.php:208
-msgid "Something weird happened."
-msgstr "Er is iets vreemds gebeurd."
-
-#: finishopenidlogin.php:66
+#: finishopenidlogin.php:65
#, php-format
msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one."
msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt."
-#: finishopenidlogin.php:72
+#: finishopenidlogin.php:71
msgid "OpenID Account Setup"
msgstr "Instellingen OpenID"
-#: finishopenidlogin.php:97
+#: finishopenidlogin.php:101
msgid "Create new account"
msgstr "Nieuwe gebruiker aanmaken"
-#: finishopenidlogin.php:99
+#: finishopenidlogin.php:103
msgid "Create a new user with this nickname."
msgstr "Nieuwe gebruiker met deze naam aanmaken."
-#: finishopenidlogin.php:102
+#: finishopenidlogin.php:106
msgid "New nickname"
msgstr "Nieuwe gebruiker"
-#: finishopenidlogin.php:104
+#: finishopenidlogin.php:108
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 kleine letters of getallen; geen leestekens of spaties"
-#: finishopenidlogin.php:114
-msgid "My text and files are available under "
-msgstr "Mijn teksten en bestanden zijn beschikbaar onder"
-
-#: finishopenidlogin.php:117
-msgid " except this private data: password, email address, IM address, phone number."
-msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
-
-#: finishopenidlogin.php:121
+#: finishopenidlogin.php:130
msgid "Create"
msgstr "Aanmaken"
-#: finishopenidlogin.php:126
+#: finishopenidlogin.php:135
msgid "Connect existing account"
msgstr "Koppelen met bestaande gebruiker"
-#: finishopenidlogin.php:128
+#: finishopenidlogin.php:137
msgid "If you already have an account, login with your username and password to connect it to your OpenID."
msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID."
-#: finishopenidlogin.php:131
+#: finishopenidlogin.php:140
msgid "Existing nickname"
msgstr "Bestaande gebruiker"
-#: finishopenidlogin.php:134
+#: finishopenidlogin.php:143
msgid "Password"
msgstr "Wachtwoord"
-#: finishopenidlogin.php:137
+#: finishopenidlogin.php:146
msgid "Connect"
msgstr "Koppelen"
-#: finishopenidlogin.php:215
-#: finishopenidlogin.php:224
+#: finishopenidlogin.php:158
+#: finishaddopenid.php:88
+msgid "OpenID authentication cancelled."
+msgstr "De authenticatie via OpenID is afgebroken."
+
+#: finishopenidlogin.php:162
+#: finishaddopenid.php:92
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "De authenticatie via OpenID is mislukt: %s"
+
+#: finishopenidlogin.php:227
+#: finishopenidlogin.php:236
msgid "Registration not allowed."
msgstr "Registreren is niet mogelijk."
-#: finishopenidlogin.php:231
+#: finishopenidlogin.php:243
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is niet geldig."
-#: finishopenidlogin.php:241
+#: finishopenidlogin.php:253
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten."
-#: finishopenidlogin.php:246
+#: finishopenidlogin.php:258
msgid "Nickname not allowed."
msgstr "Deze gebruikersnaam is niet toegestaan."
-#: finishopenidlogin.php:251
+#: finishopenidlogin.php:263
msgid "Nickname already in use. Try another one."
msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere."
-#: finishopenidlogin.php:258
-#: finishopenidlogin.php:338
+#: finishopenidlogin.php:270
+#: finishopenidlogin.php:350
msgid "Stored OpenID not found."
msgstr "Het opgeslagen OpenID is niet aangetroffen."
-#: finishopenidlogin.php:267
+#: finishopenidlogin.php:279
msgid "Creating new account for OpenID that already has a user."
msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft."
-#: finishopenidlogin.php:327
+#: finishopenidlogin.php:339
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
-#: finishopenidlogin.php:345
+#: finishopenidlogin.php:357
msgid "Error connecting user to OpenID."
msgstr "Fout bij het koppelen met OpenID."
-#: openid.php:141
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Het was niet mogelijk een OpenID-object aan te maken."
-
-#: openid.php:151
-msgid "Not a valid OpenID."
-msgstr "Geen geldige OpenID."
-
-#: openid.php:153
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID-fout: %s"
-
-#: openid.php:180
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Het was niet mogelijk door te verwijzen naar de server: %s"
-
-#: openid.php:198
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s"
-
-#: openid.php:214
-msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
-msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan."
-
-#: openid.php:246
-msgid "Error saving the profile."
-msgstr "Fout bij het opslaan van het profiel."
-
-#: openid.php:257
-msgid "Error saving the user."
-msgstr "Fout bij het opslaan van de gebruiker."
-
-#: openid.php:277
-msgid "OpenID Auto-Submit"
-msgstr "OpenID automatisch opslaan"
-
-#: openidlogin.php:66
+#: openidlogin.php:68
#, php-format
msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings."
msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen."
-#: openidlogin.php:70
+#: openidlogin.php:72
#, php-format
msgid "Login with an [OpenID](%%doc.openid%%) account."
msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker."
-#: openidlogin.php:112
-msgid "OpenID login"
+#: openidlogin.php:97
+#: finishaddopenid.php:170
+msgid "OpenID Login"
msgstr "Aanmelden via OpenID"
-#: openidlogin.php:117
-#: openidsettings.php:107
-msgid "OpenID URL"
-msgstr "OpenID-URL"
+#: openidlogin.php:114
+msgid "OpenID login"
+msgstr "Aanmelden via OpenID"
-#: openidlogin.php:119
+#: openidlogin.php:121
msgid "Your OpenID URL"
msgstr "Uw OpenID-URL"
-#: openidlogin.php:122
+#: openidlogin.php:124
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: openidlogin.php:123
+#: openidlogin.php:125
msgid "Automatically login in the future; not for shared computers!"
msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!"
-#: openidlogin.php:127
+#: openidlogin.php:129
msgid "Login"
msgstr "Aanmelden"
-#: OpenIDPlugin.php:123
-#: OpenIDPlugin.php:135
-msgid "OpenID"
-msgstr "OpenID"
-
-#: OpenIDPlugin.php:124
-msgid "Login or register with OpenID"
-msgstr "Aanmelden of registreren met OpenID"
-
-#: OpenIDPlugin.php:136
-msgid "Add or remove OpenIDs"
-msgstr "OpenID's toevoegen of verwijderen"
-
-#: OpenIDPlugin.php:324
-msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
-msgstr "Gebruik <a href=\"http://openid.net/\">OpenID</a> om aan te melden bij de site."
-
-#: openidserver.php:106
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "U mag de identiteit %s niet gebruiken."
-
-#: openidserver.php:126
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr "Gewoon een OpenID-provider. Niets te zien hier..."
-
-#: openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID-instellingen"
-
-#: openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here."
-msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren."
-
-#: openidsettings.php:99
-msgid "Add OpenID"
-msgstr "OpenID toevoegen"
-
-#: openidsettings.php:102
-msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"."
-msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"."
-
-#: openidsettings.php:117
-msgid "Add"
-msgstr "Toevoegen"
-
-#: openidsettings.php:129
-msgid "Remove OpenID"
-msgstr "OpenID verwijderen"
-
-#: openidsettings.php:134
-msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
-msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe."
-
-#: openidsettings.php:149
-msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
-msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"."
-
-#: openidsettings.php:172
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: openidsettings.php:228
-msgid "No such OpenID."
-msgstr "De OpenID bestaat niet."
-
-#: openidsettings.php:233
-msgid "That OpenID does not belong to you."
-msgstr "Die OpenID is niet van u."
-
-#: openidsettings.php:237
-msgid "OpenID removed."
-msgstr "OpenID verwijderd."
-
#: openidtrust.php:51
msgid "OpenID Identity Verification"
msgstr "OpenID-identiteitscontrole"
@@ -325,16 +361,35 @@ msgstr "OpenID-identiteitscontrole"
msgid "This page should only be reached during OpenID processing, not directly."
msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct."
-#: openidtrust.php:118
+#: openidtrust.php:117
#, php-format
msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password."
msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren."
-#: openidtrust.php:136
+#: openidtrust.php:135
msgid "Continue"
msgstr "Doorgaan"
-#: openidtrust.php:137
+#: openidtrust.php:136
msgid "Cancel"
msgstr "Annuleren"
+#: finishaddopenid.php:67
+msgid "Not logged in."
+msgstr "Niet aangemeld."
+
+#: finishaddopenid.php:112
+msgid "You already have this OpenID!"
+msgstr "U hebt deze OpenID al!"
+
+#: finishaddopenid.php:114
+msgid "Someone else already has this OpenID."
+msgstr "Iemand anders gebruikt deze OpenID al."
+
+#: finishaddopenid.php:126
+msgid "Error connecting user."
+msgstr "Fout bij het verbinden met de gebruiker."
+
+#: finishaddopenid.php:131
+msgid "Error updating profile"
+msgstr "Fout bij het bijwerken van het profiel."
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 152438917..4ce350f77 100644
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -134,6 +134,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
$consumer = oid_consumer();
if (!$consumer) {
+ // TRANS: OpenID plugin server error.
common_server_error(_m('Cannot instantiate OpenID consumer object.'));
return false;
}
@@ -144,8 +145,13 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
// Handle failure status return values.
if (!$auth_request) {
+ common_log(LOG_ERR, __METHOD__ . ": mystery fail contacting $openid_url");
+ // TRANS: OpenID plugin message. Given when an OpenID is not valid.
return _m('Not a valid OpenID.');
} else if (Auth_OpenID::isFailure($auth_request)) {
+ common_log(LOG_ERR, __METHOD__ . ": OpenID fail to $openid_url: $auth_request->message");
+ // TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+ // TRANS: %s is the failure message.
return sprintf(_m('OpenID failure: %s'), $auth_request->message);
}
@@ -164,6 +170,15 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
$auth_request->addExtension($sreg_request);
}
+ $requiredTeam = common_config('openid', 'required_team');
+ if ($requiredTeam) {
+ // LaunchPad OpenID extension
+ $team_request = new Auth_OpenID_TeamsRequest(array($requiredTeam));
+ if ($team_request) {
+ $auth_request->addExtension($team_request);
+ }
+ }
+
$trust_root = common_root_url(true);
$process_url = common_local_url($returnto);
@@ -173,6 +188,8 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
$immediate);
if (!$redirect_url) {
} else if (Auth_OpenID::isFailure($redirect_url)) {
+ // TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+ // TRANS: %s is the failure message.
return sprintf(_m('Could not redirect to server: %s'), $redirect_url->message);
} else {
common_redirect($redirect_url, 303);
@@ -191,6 +208,8 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
// Display an error if the form markup couldn't be generated;
// otherwise, render the HTML.
if (Auth_OpenID::isFailure($form_html)) {
+ // TRANS: OpenID plugin server error if the form markup could not be generated.
+ // TRANS: %s is the failure message.
common_server_error(sprintf(_m('Could not create OpenID form: %s'), $form_html->message));
} else {
$action = new AutosubmitAction(); // see below
@@ -207,16 +226,20 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
function _oid_print_instructions()
{
common_element('div', 'instructions',
+ // TRANS: OpenID plugin user instructions.
_m('This form should automatically submit itself. '.
'If not, click the submit button to go to your '.
'OpenID provider.'));
}
-# update a user from sreg parameters
-
-function oid_update_user(&$user, &$sreg)
+/**
+ * Update a user from sreg parameters
+ * @param User $user
+ * @param array $sreg fields from OpenID sreg response
+ * @access private
+ */
+function oid_update_user($user, $sreg)
{
-
$profile = $user->getProfile();
$orig_profile = clone($profile);
@@ -239,6 +262,7 @@ function oid_update_user(&$user, &$sreg)
# XXX save timezone if it's passed
if (!$profile->update($orig_profile)) {
+ // TRANS: OpenID plugin server error.
common_server_error(_m('Error saving the profile.'));
return false;
}
@@ -250,6 +274,7 @@ function oid_update_user(&$user, &$sreg)
}
if (!$user->update($orig_user)) {
+ // TRANS: OpenID plugin server error.
common_server_error(_m('Error saving the user.'));
return false;
}
@@ -279,6 +304,7 @@ function oid_assert_allowed($url)
return;
}
}
+ // TRANS: OpenID plugin client exception (403).
throw new ClientException(_m("Unauthorized URL used for OpenID login."), 403);
}
}
@@ -286,6 +312,33 @@ function oid_assert_allowed($url)
return;
}
+/**
+ * Check the teams available in the given OpenID response
+ * Using Launchpad's OpenID teams extension
+ *
+ * @return boolean whether this user is acceptable
+ */
+function oid_check_teams($response)
+{
+ $requiredTeam = common_config('openid', 'required_team');
+ if ($requiredTeam) {
+ $team_resp = new Auth_OpenID_TeamsResponse($response);
+ if ($team_resp) {
+ $teams = $team_resp->getTeams();
+ } else {
+ $teams = array();
+ }
+
+ $match = in_array($requiredTeam, $teams);
+ $is = $match ? 'is' : 'is not';
+ common_log(LOG_DEBUG, "Remote user $is in required team $requiredTeam: [" . implode(', ', $teams) . "]");
+
+ return $match;
+ }
+
+ return true;
+}
+
class AutosubmitAction extends Action
{
var $form_html = null;
@@ -299,11 +352,24 @@ class AutosubmitAction extends Action
function title()
{
- return _m('OpenID Auto-Submit');
+ // TRANS: Title
+ return _m('OpenID Login Submission');
}
function showContent()
{
+ $this->raw('<p style="margin: 20px 80px">');
+ // @fixme this would be better using standard CSS class, but the present theme's a bit scary.
+ $this->element('img', array('src' => Theme::path('images/icons/icon_processing.gif', 'base'),
+ // for some reason the base CSS sets <img>s as block display?!
+ 'style' => 'display: inline'));
+ // TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+ $this->text(_m('Requesting authorization from your login provider...'));
+ $this->raw('</p>');
+ $this->raw('<p style="margin-top: 60px; font-style: italic">');
+ // TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+ $this->text(_m('If you are not redirected to your login provider in a few seconds, try pushing the button below.'));
+ $this->raw('</p>');
$this->raw($this->form_html);
}
@@ -311,8 +377,6 @@ class AutosubmitAction extends Action
{
parent::showScripts();
$this->element('script', null,
- '$(document).ready(function() { ' .
- ' $(\'#'. $this->form_id .'\').submit(); '.
- '});');
+ 'document.getElementById(\'' . $this->form_id . '\').submit();');
}
}
diff --git a/plugins/OpenID/openidadminpanel.php b/plugins/OpenID/openidadminpanel.php
new file mode 100644
index 000000000..ce4806cc8
--- /dev/null
+++ b/plugins/OpenID/openidadminpanel.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * OpenID bridge administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Settings
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Administer global OpenID settings
+ *
+ * @category Admin
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class OpenidadminpanelAction extends AdminPanelAction
+{
+ /**
+ * Returns the page title
+ *
+ * @return string page title
+ */
+
+ function title()
+ {
+ return _m('OpenID');
+ }
+
+ /**
+ * Instructions for using this form.
+ *
+ * @return string instructions
+ */
+
+ function getInstructions()
+ {
+ return _m('OpenID settings');
+ }
+
+ /**
+ * Show the OpenID admin panel form
+ *
+ * @return void
+ */
+
+ function showForm()
+ {
+ $form = new OpenIDAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save settings from the form
+ *
+ * @return void
+ */
+
+ function saveSettings()
+ {
+ static $settings = array(
+ 'openid' => array('trusted_provider', 'required_team')
+ );
+
+ static $booleans = array(
+ 'openid' => array('append_username'),
+ 'site' => array('openidonly')
+ );
+
+ $values = array();
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting]
+ = $this->trimmed($setting);
+ }
+ }
+
+ foreach ($booleans as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting]
+ = ($this->boolean($setting)) ? 1 : 0;
+ }
+ }
+
+ // This throws an exception on validation errors
+
+ $this->validate($values);
+
+ // assert(all values are valid);
+
+ $config = new Config();
+
+ $config->query('BEGIN');
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ foreach ($booleans as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ function validate(&$values)
+ {
+ // Validate consumer key and secret (can't be too long)
+
+ if (mb_strlen($values['openid']['trusted_provider']) > 255) {
+ $this->clientError(
+ _m("Invalid provider URL. Max length is 255 characters.")
+ );
+ }
+
+ if (mb_strlen($values['openid']['required_team']) > 255) {
+ $this->clientError(
+ _m("Invalid team name. Max length is 255 characters.")
+ );
+ }
+ }
+}
+
+class OpenIDAdminPanelForm extends AdminForm
+{
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+
+ function id()
+ {
+ return 'openidadminpanel';
+ }
+
+ /**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_settings';
+ }
+
+ /**
+ * Action of the form
+ *
+ * @return string URL of the action
+ */
+
+ function action()
+ {
+ return common_local_url('openidadminpanel');
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ *
+ * @todo Some of the options could prevent users from logging in again.
+ * Make sure that the acting administrator has a valid OpenID matching,
+ * or more carefully warn folks.
+ */
+
+ function formData()
+ {
+ $this->out->elementStart(
+ 'fieldset',
+ array('id' => 'settings_openid')
+ );
+ $this->out->element('legend', null, _m('Trusted provider'));
+ $this->out->element('p', 'form_guide',
+ _m('By default, users are allowed to authenticate with any OpenID provider. ' .
+ 'If you are using your own OpenID service for shared sign-in, ' .
+ 'you can restrict access to only your own users here.'));
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+ $this->input(
+ 'trusted_provider',
+ _m('Provider URL'),
+ _m('All OpenID logins will be sent to this URL; other providers may not be used.'),
+ 'openid'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->out->checkbox(
+ 'append_username', _m('Append a username to base URL'),
+ (bool) $this->value('append_username', 'openid'),
+ _m('Login form will show the base URL and prompt for a username to add at the end. Use when OpenID provider URL should be the profile page for individual users.'),
+ 'true'
+ );
+ $this->unli();
+
+ $this->li();
+ $this->input(
+ 'required_team',
+ _m('Required team'),
+ _m('Only allow logins from users in the given team (Launchpad extension).'),
+ 'openid'
+ );
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart(
+ 'fieldset',
+ array('id' => 'settings_openid-options')
+ );
+ $this->out->element('legend', null, _m('Options'));
+
+ $this->out->elementStart('ul', 'form_data');
+
+ $this->li();
+
+ $this->out->checkbox(
+ 'openidonly', _m('Enable OpenID-only mode'),
+ (bool) $this->value('openidonly', 'site'),
+ _m('Require all users to login via OpenID. WARNING: disables password authentication for all users!'),
+ 'true'
+ );
+ $this->unli();
+
+ $this->out->elementEnd('ul');
+
+ $this->out->elementEnd('fieldset');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit('submit', _('Save'), 'submit', null, _m('Save OpenID settings'));
+ }
+}
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 2a743672c..20d6e070c 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -27,15 +27,25 @@ class OpenidloginAction extends Action
{
parent::handle($args);
if (common_is_real_login()) {
+ // TRANS: Client error message trying to log on with OpenID while already logged on.
$this->clientError(_m('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $openid_url = $this->trimmed('openid_url');
+ $provider = common_config('openid', 'trusted_provider');
+ if ($provider) {
+ $openid_url = $provider;
+ if (common_config('openid', 'append_username')) {
+ $openid_url .= $this->trimmed('openid_username');
+ }
+ } else {
+ $openid_url = $this->trimmed('openid_url');
+ }
oid_assert_allowed($openid_url);
# CSRF protection
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
+ // TRANS: Message given when there is a problem with the user's session token.
$this->showForm(_m('There was a problem with your session token. Try again, please.'), $openid_url);
return;
}
@@ -65,10 +75,14 @@ class OpenidloginAction extends Action
common_get_returnto()) {
// rememberme logins have to reauthenticate before
// changing any profile settings (cookie-stealing protection)
+ // TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+ // TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
return _m('For security reasons, please re-login with your ' .
'[OpenID](%%doc.openid%%) ' .
'before changing your settings.');
} else {
+ // TRANS: OpenID plugin message.
+ // TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
return _m('Login with an [OpenID](%%doc.openid%%) account.');
}
}
@@ -89,11 +103,20 @@ class OpenidloginAction extends Action
function showScripts()
{
parent::showScripts();
- $this->autofocus('openid_url');
+ if (common_config('openid', 'trusted_provider')) {
+ if (common_config('openid', 'append_username')) {
+ $this->autofocus('openid_username');
+ } else {
+ $this->autofocus('rememberme');
+ }
+ } else {
+ $this->autofocus('openid_url');
+ }
}
function title()
{
+ // TRANS: OpenID plugin message. Title.
return _m('OpenID Login');
}
@@ -111,22 +134,44 @@ class OpenidloginAction extends Action
'class' => 'form_settings',
'action' => $formaction));
$this->elementStart('fieldset');
+ // TRANS: OpenID plugin logon form legend.
$this->element('legend', null, _m('OpenID login'));
$this->hidden('token', common_session_token());
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->input('openid_url', _m('OpenID URL'),
- $this->openid_url,
- _m('Your OpenID URL'));
+ $provider = common_config('openid', 'trusted_provider');
+ $appendUsername = common_config('openid', 'append_username');
+ if ($provider) {
+ $this->element('label', array(), _m('OpenID provider'));
+ $this->element('span', array(), $provider);
+ if ($appendUsername) {
+ $this->element('input', array('id' => 'openid_username',
+ 'name' => 'openid_username',
+ 'style' => 'float: none'));
+ }
+ $this->element('p', 'form_guide',
+ ($appendUsername ? _m('Enter your username.') . ' ' : '') .
+ _m('You will be sent to the provider\'s site for authentication.'));
+ $this->hidden('openid_url', $provider);
+ } else {
+ // TRANS: OpenID plugin logon form field label.
+ $this->input('openid_url', _m('OpenID URL'),
+ $this->openid_url,
+ // TRANS: OpenID plugin logon form field instructions.
+ _m('Your OpenID URL'));
+ }
$this->elementEnd('li');
$this->elementStart('li', array('id' => 'settings_rememberme'));
+ // TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
$this->checkbox('rememberme', _m('Remember me'), false,
+ // TRANS: OpenID plugin logon form field instructions.
_m('Automatically login in the future; ' .
'not for shared computers!'));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('submit', _m('Login'));
+ // TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+ $this->submit('submit', _m('BUTTON', 'Login'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
index a31596a10..b2cf1f8ac 100644
--- a/plugins/OpenID/openidserver.php
+++ b/plugins/OpenID/openidserver.php
@@ -23,6 +23,7 @@
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -43,6 +44,7 @@ require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
* @category Settings
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -69,7 +71,11 @@ class OpenidserverAction extends Action
//cannot prompt the user to login in immediate mode, so answer false
$response = $this->generateDenyResponse($request);
}else{
- /* Go log in, and then come back. */
+ // Go log in, and then come back.
+ //
+ // Note: 303 redirect rather than 307 to avoid
+ // prompting user for form resubmission if we
+ // were POSTed here.
common_set_returnto($_SERVER['REQUEST_URI']);
common_redirect(common_local_url('login'), 303);
return;
@@ -90,7 +96,12 @@ class OpenidserverAction extends Action
$this->oserver->encodeResponse($denyResponse); //sign the response
$_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl();
$_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl();
- //ask the user to trust this trust root
+
+ // Ask the user to trust this trust root...
+ //
+ // Note: 303 redirect rather than 307 to avoid
+ // prompting user for form resubmission if we
+ // were POSTed here.
common_redirect(common_local_url('openidtrust'), 303);
return;
}
@@ -103,6 +114,7 @@ class OpenidserverAction extends Action
$response = $this->generateDenyResponse($request);
} else {
//invalid
+ // TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
$this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403);
}
} else {
@@ -123,6 +135,7 @@ class OpenidserverAction extends Action
}
$this->raw($response->body);
}else{
+ // TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
$this->clientError(_m('Just an OpenID provider. Nothing to see here, move along...'),$code=500);
}
}
diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php
index 16142cf48..505e7d0ee 100644
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@ -90,34 +90,36 @@ class OpenidsettingsAction extends AccountSettingsAction
{
$user = common_current_user();
- $this->elementStart('form', array('method' => 'post',
- 'id' => 'form_settings_openid_add',
- 'class' => 'form_settings',
- 'action' =>
- common_local_url('openidsettings')));
- $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
- $this->element('legend', null, _m('Add OpenID'));
- $this->hidden('token', common_session_token());
- $this->element('p', 'form_guide',
- _m('If you want to add an OpenID to your account, ' .
- 'enter it in the box below and click "Add".'));
- $this->elementStart('ul', 'form_data');
- $this->elementStart('li');
- $this->element('label', array('for' => 'openid_url'),
- _m('OpenID URL'));
- $this->element('input', array('name' => 'openid_url',
- 'type' => 'text',
- 'id' => 'openid_url'));
- $this->elementEnd('li');
- $this->elementEnd('ul');
- $this->element('input', array('type' => 'submit',
- 'id' => 'settings_openid_add_action-submit',
- 'name' => 'add',
- 'class' => 'submit',
- 'value' => _m('Add')));
- $this->elementEnd('fieldset');
- $this->elementEnd('form');
-
+ if (!common_config('openid', 'trusted_provider')) {
+ $this->elementStart('form', array('method' => 'post',
+ 'id' => 'form_settings_openid_add',
+ 'class' => 'form_settings',
+ 'action' =>
+ common_local_url('openidsettings')));
+ $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
+
+ $this->element('legend', null, _m('Add OpenID'));
+ $this->hidden('token', common_session_token());
+ $this->element('p', 'form_guide',
+ _m('If you want to add an OpenID to your account, ' .
+ 'enter it in the box below and click "Add".'));
+ $this->elementStart('ul', 'form_data');
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'openid_url'),
+ _m('OpenID URL'));
+ $this->element('input', array('name' => 'openid_url',
+ 'type' => 'text',
+ 'id' => 'openid_url'));
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
+ $this->element('input', array('type' => 'submit',
+ 'id' => 'settings_openid_add_action-submit',
+ 'name' => 'add',
+ 'class' => 'submit',
+ 'value' => _m('Add')));
+ $this->elementEnd('fieldset');
+ $this->elementEnd('form');
+ }
$oid = new User_openid();
$oid->user_id = $user->id;
@@ -234,10 +236,14 @@ class OpenidsettingsAction extends AccountSettingsAction
}
if ($this->arg('add')) {
- $result = oid_authenticate($this->trimmed('openid_url'),
- 'finishaddopenid');
- if (is_string($result)) { // error message
- $this->showForm($result);
+ if (common_config('openid', 'trusted_provider')) {
+ $this->showForm(_m("Can't add new providers."));
+ } else {
+ $result = oid_authenticate($this->trimmed('openid_url'),
+ 'finishaddopenid');
+ if (is_string($result)) { // error message
+ $this->showForm($result);
+ }
}
} else if ($this->arg('remove')) {
$this->removeOpenid();
diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot
new file mode 100644
index 000000000..b7107d4c1
--- /dev/null
+++ b/plugins/PostDebug/locale/PostDebug.pot
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: PostDebugPlugin.php:58
+msgid "Debugging tool to record request details on POST."
+msgstr ""
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
index 8f8434a85..bc0e814f2 100644
--- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
+++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index cdf46846b..25a463c0b 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot
new file mode 100644
index 000000000..a888f80e4
--- /dev/null
+++ b/plugins/PtitUrl/locale/PtitUrl.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: PtitUrlPlugin.php:67
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 001106ace..c1951cdbf 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -100,7 +100,7 @@ class RSSCloudPlugin extends Plugin
*
* Hook for RouterInitialized event.
*
- * @param Mapper &$m URL parser and mapper
+ * @param Mapper $m URL parser and mapper
*
* @return boolean hook return
*/
@@ -192,25 +192,13 @@ class RSSCloudPlugin extends Plugin
function onStartEnqueueNotice($notice, &$transports)
{
- array_push($transports, 'rsscloud');
+ if ($notice->isLocal()) {
+ array_push($transports, 'rsscloud');
+ }
return true;
}
/**
- * Determine whether the notice was locally created
- *
- * @param Notice $notice the notice in question
- *
- * @return boolean locality
- */
-
- function _isLocal($notice)
- {
- return ($notice->is_local == Notice::LOCAL_PUBLIC ||
- $notice->is_local == Notice::LOCAL_NONPUBLIC);
- }
-
- /**
* Create the rsscloud_subscription table if it's not
* already in the DB
*
diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot
new file mode 100644
index 000000000..4078cc749
--- /dev/null
+++ b/plugins/RSSCloud/locale/RSSCloud.pot
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: RSSCloudPlugin.php:260
+msgid ""
+"The RSSCloud plugin enables your StatusNet instance to publish real-time "
+"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
+"\">RSSCloud protocol</a>\"."
+msgstr ""
diff --git a/plugins/Realtime/README b/plugins/Realtime/README
index 524382696..99c79cfab 100644
--- a/plugins/Realtime/README
+++ b/plugins/Realtime/README
@@ -1,6 +1,5 @@
== TODO ==
* i18n
-* Change in context URL to conversation (try not to construct the URL in JS)
* Update mark behaviour (on notice send)
* Pause, Send a notice ~ should not update counter
* Pause ~ retain up to 50-100 most recent notices
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index b559d80c6..352afcf78 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -250,14 +250,7 @@ class RealtimePlugin extends Plugin
$arr['url'] = $notice->bestUrl();
$arr['html'] = htmlspecialchars($notice->rendered);
$arr['source'] = htmlspecialchars($arr['source']);
-
- if (!empty($notice->reply_to)) {
- $reply_to = Notice::staticGet('id', $notice->reply_to);
- if (!empty($reply_to)) {
- $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
- }
- $reply_to = null;
- }
+ $arr['conversation_url'] = $this->getConversationUrl($notice);
$profile = $notice->getProfile();
$arr['user']['profile_url'] = $profile->profileurl;
@@ -272,10 +265,7 @@ class RealtimePlugin extends Plugin
$arr['retweeted_status']['source'] = htmlspecialchars($original->source);
$originalProfile = $original->getProfile();
$arr['retweeted_status']['user']['profile_url'] = $originalProfile->profileurl;
- if (!empty($original->reply_to)) {
- $originalReply = Notice::staticGet('id', $original->reply_to);
- $arr['retweeted_status']['in_reply_to_status_url'] = $originalReply->bestUrl();
- }
+ $arr['retweeted_status']['conversation_url'] = $this->getConversationUrl($original);
}
$original = null;
}
@@ -303,6 +293,34 @@ class RealtimePlugin extends Plugin
return $tags;
}
+ function getConversationUrl($notice)
+ {
+ $convurl = null;
+
+ if ($notice->hasConversation()) {
+ $conv = Conversation::staticGet(
+ 'id',
+ $notice->conversation
+ );
+ $convurl = $conv->uri;
+
+ if(empty($convurl)) {
+ $msg = sprintf(
+ "Couldn't find Conversation ID %d to make 'in context'"
+ . "link for Notice ID %d",
+ $notice->conversation,
+ $notice->id
+ );
+
+ common_log(LOG_WARNING, $msg);
+ } else {
+ $convurl .= '#notice-' . $notice->id;
+ }
+ }
+
+ return $convurl;
+ }
+
function _getScripts()
{
return array('plugins/Realtime/realtimeupdate.js');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 2e5851ae5..25dc12d58 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -149,8 +149,8 @@ RealtimeUpdate = {
"from "+
"<span class=\"device\">"+source+"</span>"+ // may have a link
"</span>";
- if (data['in_reply_to_status_id']) {
- ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
+ if (data['conversation_url']) {
+ ni = ni+" <a class=\"response\" href=\""+data['conversation_url']+"\">in context</a>";
}
if (repeat) {
diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index c585da43c..7cc34c568 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -62,12 +62,32 @@ class RecaptchaPlugin extends Plugin
{
$action->elementStart('li');
$action->raw('<label for="recaptcha">Captcha</label>');
- if($this->checkssl() === true) {
- $action->raw(recaptcha_get_html($this->public_key), null, true);
- } else {
- $action->raw(recaptcha_get_html($this->public_key));
- }
+
+ // AJAX API will fill this div out.
+ // We're calling that instead of the regular one so we stay compatible
+ // with application/xml+xhtml output as for mobile.
+ $action->element('div', array('id' => 'recaptcha'));
$action->elementEnd('li');
+
+ $action->recaptchaPluginNeedsOutput = true;
+ return true;
+ }
+
+ function onEndShowScripts($action)
+ {
+ if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
+ // Load the AJAX API
+ if ($this->checkssl()) {
+ $url = "https://api-secure.recaptcha.net/js/recaptcha_ajax.js";
+ } else {
+ $url = "http://api.recaptcha.net/js/recaptcha_ajax.js";
+ }
+ $action->script($url);
+
+ // And when we're ready, fill out the captcha!
+ $key = json_encode($this->public_key);
+ $action->inlinescript("\$(function(){Recaptcha.create($key, 'recaptcha');});");
+ }
return true;
}
diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot
new file mode 100644
index 000000000..6611ff604
--- /dev/null
+++ b/plugins/Recaptcha/locale/Recaptcha.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: RecaptchaPlugin.php:97
+msgid ""
+"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a "
+"captcha to the registration page."
+msgstr ""
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
new file mode 100644
index 000000000..834f5fd4a
--- /dev/null
+++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161
+msgid "Cannot find IP address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:167
+msgid "Cannot find user after successful registration."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:200
+msgid "Throttles excessive registration from a single IP."
+msgstr ""
diff --git a/plugins/RequireValidatedEmail/README b/plugins/RequireValidatedEmail/README
index 46ee24d5f..84b1485b2 100644
--- a/plugins/RequireValidatedEmail/README
+++ b/plugins/RequireValidatedEmail/README
@@ -12,6 +12,20 @@ registered prior to that timestamp.
addPlugin('RequireValidatedEmail',
array('grandfatherCutoff' => 'Dec 7, 2009');
+You can also exclude the validation checks from OpenID accounts
+connected to a trusted provider, by providing a list of regular
+expressions to match their provider URLs.
+
+For example, to trust WikiHow and Wikipedia users:
+
+ addPlugin('RequireValidatedEmailPlugin', array(
+ 'trustedOpenIDs' => array(
+ '!^http://\w+\.wikihow\.com/!',
+ '!^http://\w+\.wikipedia\.org/!',
+ ),
+ ));
+
+
Todo:
* add a more visible indicator that validation is still outstanding
diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index ccefa14f6..af75b96e0 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -21,8 +21,9 @@
*
* @category Plugin
* @package StatusNet
- * @author Craig Andrews <candrews@integralblue.com>, Brion Vibber <brion@status.net>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @author Brion Vibber <brion@status.net>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -37,6 +38,20 @@ class RequireValidatedEmailPlugin extends Plugin
// without the validation requirement.
public $grandfatherCutoff=null;
+ // If OpenID plugin is installed, users with a verified OpenID
+ // association whose provider URL matches one of these regexes
+ // will be considered to be sufficiently valid for our needs.
+ //
+ // For example, to trust WikiHow and Wikipedia OpenID users:
+ //
+ // addPlugin('RequireValidatedEmailPlugin', array(
+ // 'trustedOpenIDs' => array(
+ // '!^http://\w+\.wikihow\.com/!',
+ // '!^http://\w+\.wikipedia\.org/!',
+ // ),
+ // ));
+ public $trustedOpenIDs=array();
+
function __construct()
{
parent::__construct();
@@ -90,13 +105,17 @@ class RequireValidatedEmailPlugin extends Plugin
*/
protected function validated($user)
{
- if ($this->grandfathered($user)) {
- return true;
- }
-
// The email field is only stored after validation...
// Until then you'll find them in confirm_address.
- return !empty($user->email);
+ $knownGood = !empty($user->email) ||
+ $this->grandfathered($user) ||
+ $this->hasTrustedOpenID($user);
+
+ // Give other plugins a chance to override, if they can validate
+ // that somebody's ok despite a non-validated email.
+ Event::handle('RequireValidatedEmailPlugin_Override', array($user, &$knownGood));
+
+ return $knownGood;
}
/**
@@ -118,6 +137,28 @@ class RequireValidatedEmailPlugin extends Plugin
return false;
}
+ /**
+ * Override for RequireValidatedEmail plugin. If we have a user who's
+ * not validated an e-mail, but did come from a trusted provider,
+ * we'll consider them ok.
+ */
+ function hasTrustedOpenID($user)
+ {
+ if ($this->trustedOpenIDs && class_exists('User_openid')) {
+ foreach ($this->trustedOpenIDs as $regex) {
+ $oid = new User_openid();
+ $oid->user_id = $user->id;
+ $oid->find();
+ while ($oid->fetch()) {
+ if (preg_match($regex, $oid->canonical)) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'Require Validated Email',
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index 49ac4f6f4..c8953a1fa 100644
--- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
+++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-10 10:05-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
index dac5a1588..8a05a7734 100644
--- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
+++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
new file mode 100644
index 000000000..6fa18c464
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ReverseUsernameAuthenticationPlugin.php:67
+msgid ""
+"The Reverse Username Authentication plugin allows for StatusNet to handle "
+"authentication by checking if the provided password is the same as the "
+"reverse of the username."
+msgstr ""
diff --git a/plugins/Sample/User_greeting_count.php b/plugins/Sample/User_greeting_count.php
index d9a59770d..fc0cbd28f 100644
--- a/plugins/Sample/User_greeting_count.php
+++ b/plugins/Sample/User_greeting_count.php
@@ -94,29 +94,34 @@ class User_greeting_count extends Memcached_DataObject
/**
* return key definitions for DB_DataObject
*
- * DB_DataObject needs to know about keys that the table has; this function
- * defines them.
+ * DB_DataObject needs to know about keys that the table has, since it
+ * won't appear in StatusNet's own keys list. In most cases, this will
+ * simply reference your keyTypes() function.
*
- * @return array key definitions
+ * @return array list of key field names
*/
function keys()
{
- return array('user_id' => 'K');
+ return array_keys($this->keyTypes());
}
/**
* return key definitions for Memcached_DataObject
*
* Our caching system uses the same key definitions, but uses a different
- * method to get them.
+ * method to get them. This key information is used to store and clear
+ * cached data, so be sure to list any key that will be used for static
+ * lookups.
*
- * @return array key definitions
+ * @return array associative array of key definitions, field name to type:
+ * 'K' for primary key: for compound keys, add an entry for each component;
+ * 'U' for unique keys: compound keys are not well supported here.
*/
function keyTypes()
{
- return $this->keys();
+ return array('user_id' => 'K');
}
/**
diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot
index a52c4ec01..bd21dd3c4 100644
--- a/plugins/Sample/locale/Sample.pot
+++ b/plugins/Sample/locale/Sample.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: hello.php:115 SamplePlugin.php:266
-msgid "Hello"
+#: User_greeting_count.php:163
+#, php-format
+msgid "Could not save new greeting count for %d"
msgstr ""
-#: hello.php:117 hello.php:141
+#: User_greeting_count.php:176
#, php-format
-msgid "Hello, %s"
+msgid "Could not increment greeting count for %d"
msgstr ""
-#: hello.php:138
-msgid "Hello, stranger!"
+#: SamplePlugin.php:266 hello.php:115
+msgid "Hello"
msgstr ""
-#: hello.php:143
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] ""
-msgstr[1] ""
-
#: SamplePlugin.php:266
msgid "A warm greeting"
msgstr ""
@@ -45,12 +39,18 @@ msgstr ""
msgid "A sample plugin to show basics of development for new hackers."
msgstr ""
-#: User_greeting_count.php:163
+#: hello.php:117 hello.php:141
#, php-format
-msgid "Could not save new greeting count for %d"
+msgid "Hello, %s"
msgstr ""
-#: User_greeting_count.php:176
-#, php-format
-msgid "Could not increment greeting count for %d"
+#: hello.php:138
+msgid "Hello, stranger!"
msgstr ""
+
+#: hello.php:143
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 5d3f97d33..24250f4d0 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot
new file mode 100644
index 000000000..e3c241d53
--- /dev/null
+++ b/plugins/SimpleUrl/locale/SimpleUrl.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: SimpleUrlPlugin.php:58
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php
new file mode 100644
index 000000000..d4d295237
--- /dev/null
+++ b/plugins/Sitemap/SitemapPlugin.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Creates a dynamic sitemap for a StatusNet site
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Sample
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ // This check helps protect against security problems;
+ // your code file can't be executed directly from the web.
+ exit(1);
+}
+
+/**
+ * Sitemap plugin
+ *
+ * @category Sample
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link http://status.net/
+ */
+
+class SitemapPlugin extends Plugin
+{
+ const USERS_PER_MAP = 50000;
+ const NOTICES_PER_MAP = 50000;
+
+ /**
+ * Load related modules when needed
+ *
+ * @param string $cls Name of the class to be loaded
+ *
+ * @return boolean hook value; true means continue processing, false means stop.
+ */
+
+ function onAutoload($cls)
+ {
+ $dir = dirname(__FILE__);
+
+ switch ($cls)
+ {
+ case 'Sitemap_user_count':
+ case 'Sitemap_notice_count':
+ require_once $dir . '/' . $cls . '.php';
+ return false;
+ case 'SitemapindexAction':
+ case 'NoticesitemapAction':
+ case 'UsersitemapAction':
+ case 'SitemapadminpanelAction':
+ require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+ return false;
+ case 'SitemapAction':
+ require_once $dir . '/' . strtolower($cls) . '.php';
+ return false;
+ default:
+ return true;
+ }
+ }
+
+ /**
+ * Add sitemap-related information at the end of robots.txt
+ *
+ * @param Action $action Action being run
+ *
+ * @return boolean hook value.
+ */
+
+ function onEndRobotsTxt($action)
+ {
+ $url = common_local_url('sitemapindex');
+
+ print "\nSitemap: $url\n";
+
+ return true;
+ }
+
+ /**
+ * Map URLs to actions
+ *
+ * @param Net_URL_Mapper $m path-to-action mapper
+ *
+ * @return boolean hook value; true means continue processing, false means stop.
+ */
+
+ function onRouterInitialized($m)
+ {
+ $m->connect('sitemapindex.xml',
+ array('action' => 'sitemapindex'));
+
+ $m->connect('/notice-sitemap-:year-:month-:day-:index.xml',
+ array('action' => 'noticesitemap'),
+ array('year' => '[0-9]{4}',
+ 'month' => '[01][0-9]',
+ 'day' => '[0123][0-9]',
+ 'index' => '[1-9][0-9]*'));
+
+ $m->connect('/user-sitemap-:year-:month-:day-:index.xml',
+ array('action' => 'usersitemap'),
+ array('year' => '[0-9]{4}',
+ 'month' => '[01][0-9]',
+ 'day' => '[0123][0-9]',
+ 'index' => '[1-9][0-9]*'));
+
+ $m->connect('admin/sitemap',
+ array('action' => 'sitemapadminpanel'));
+
+ return true;
+ }
+
+ /**
+ * Meta tags for "claiming" a site
+ *
+ * We add extra meta tags that search engines like Yahoo!, Google, and Bing
+ * require to let you claim your site.
+ *
+ * @param Action $action Action being executed
+ *
+ * @return boolean hook value.
+ */
+
+ function onStartShowHeadElements($action)
+ {
+ $actionName = $action->trimmed('action');
+
+ $singleUser = common_config('singleuser', 'enabled');
+
+ // Different "top" pages if it's single user or not
+
+ if (($singleUser && $actionName == 'showstream') ||
+ (!$singleUser && $actionName == 'public')) {
+
+ $keys = array('googlekey' => 'google-site-verification',
+ 'yahookey' => 'y_key',
+ 'bingkey' => 'msvalidate.01'); // XXX: is this the same for all sites?
+
+ foreach ($keys as $config => $metaname) {
+ $content = common_config('sitemap', $config);
+
+ if (!empty($content)) {
+ $action->element('meta', array('name' => $metaname,
+ 'content' => $content));
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Database schema setup
+ *
+ * We cache some data persistently to avoid overlong queries.
+ *
+ * @see Sitemap_user_count
+ * @see Sitemap_notice_count
+ *
+ * @return boolean hook value; true means continue processing, false means stop.
+ */
+
+ function onCheckSchema()
+ {
+ $schema = Schema::get();
+
+ $schema->ensureTable('sitemap_user_count',
+ array(new ColumnDef('registration_date', 'date', null,
+ true, 'PRI'),
+ new ColumnDef('user_count', 'integer'),
+ new ColumnDef('created', 'datetime',
+ null, false),
+ new ColumnDef('modified', 'timestamp')));
+
+ $schema->ensureTable('sitemap_notice_count',
+ array(new ColumnDef('notice_date', 'date', null,
+ true, 'PRI'),
+ new ColumnDef('notice_count', 'integer'),
+ new ColumnDef('created', 'datetime',
+ null, false),
+ new ColumnDef('modified', 'timestamp')));
+
+ return true;
+ }
+
+ function onEndAdminPanelNav($menu) {
+ if (AdminPanelAction::canAdmin('sitemap')) {
+ // TRANS: Menu item title/tooltip
+ $menu_title = _('Sitemap configuration');
+ // TRANS: Menu item for site administration
+ $menu->out->menuItem(common_local_url('sitemapadminpanel'), _('Sitemap'),
+ $menu_title, $action_name == 'sitemapadminpanel', 'nav_sitemap_admin_panel');
+ }
+ return true;
+ }
+}
diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php
new file mode 100644
index 000000000..2a375b3e4
--- /dev/null
+++ b/plugins/Sitemap/Sitemap_notice_count.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Data class for counting notice postings by date
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for counting notices by date
+ *
+ * We make a separate sitemap for each notice posted by date.
+ * To save ourselves some (not inconsiderable) processing effort,
+ * we cache this data in the sitemap_notice_count table. Each
+ * row represents a day since the site has been started, with a count
+ * of notices posted on that day. Since, after the end of the day,
+ * this number doesn't change, it's a good candidate for persistent caching.
+ *
+ * @category Data
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * @see DB_DataObject
+ */
+
+class Sitemap_notice_count extends Memcached_DataObject
+{
+ public $__table = 'sitemap_notice_count'; // table name
+
+ public $notice_date; // date primary_key not_null
+ public $notice_count; // int(4)
+ public $created;
+ public $modified;
+
+ /**
+ * Get an instance by key
+ *
+ * This is a utility method to get a single instance with a given key value.
+ *
+ * @param string $k Key to use to lookup (usually 'notice_id' for this class)
+ * @param mixed $v Value to lookup
+ *
+ * @return Sitemap_notice_count object found, or null for no hits
+ *
+ */
+
+ function staticGet($k, $v=null)
+ {
+ return Memcached_DataObject::staticGet('Sitemap_notice_count', $k, $v);
+ }
+
+ /**
+ * return table definition for DB_DataObject
+ *
+ * DB_DataObject needs to know something about the table to manipulate
+ * instances. This method provides all the DB_DataObject needs to know.
+ *
+ * @return array array of column definitions
+ */
+
+ function table()
+ {
+ return array('notice_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL,
+ 'notice_count' => DB_DATAOBJECT_INT,
+ 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+ 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+ }
+
+ /**
+ * return key definitions for DB_DataObject
+ *
+ * DB_DataObject needs to know about keys that the table has; this function
+ * defines them.
+ *
+ * @return array key definitions
+ */
+
+ function keys()
+ {
+ return array('notice_date' => 'K');
+ }
+
+ /**
+ * return key definitions for Memcached_DataObject
+ *
+ * Our caching system uses the same key definitions, but uses a different
+ * method to get them.
+ *
+ * @return array key definitions
+ */
+
+ function keyTypes()
+ {
+ return $this->keys();
+ }
+
+ static function getAll()
+ {
+ $noticeCounts = self::cacheGet('sitemap:notice:counts');
+
+ if ($noticeCounts === false) {
+
+ $snc = new Sitemap_notice_count();
+ $snc->orderBy('notice_date DESC');
+
+ // Fetch the first one to check up-to-date-itude
+
+ $n = $snc->find(true);
+
+ $today = self::today();
+ $noticeCounts = array();
+
+ if (!$n) { // No counts saved yet
+ $noticeCounts = self::initializeCounts();
+ } else if ($snc->notice_date < $today) { // There are counts but not up to today
+ $noticeCounts = self::fillInCounts($snc->notice_date);
+ } else if ($snc->notice_date == $today) { // Refresh today's
+ $noticeCounts[$today] = self::updateToday();
+ }
+
+ // starts with second-to-last date
+
+ while ($snc->fetch()) {
+ $noticeCounts[$snc->notice_date] = $snc->notice_count;
+ }
+
+ self::cacheSet('sitemap:notice:counts', $noticeCounts);
+ }
+
+ return $noticeCounts;
+ }
+
+ static function initializeCounts()
+ {
+ $firstDate = self::getFirstDate(); // awww
+ $today = self::today();
+
+ $counts = array();
+
+ for ($d = $firstDate; $d <= $today; $d = self::incrementDay($d)) {
+ $n = self::getCount($d);
+ self::insertCount($d, $n);
+ $counts[$d] = $n;
+ }
+
+ return $counts;
+ }
+
+ static function fillInCounts($lastDate)
+ {
+ $today = self::today();
+
+ $counts = array();
+
+ $n = self::getCount($lastDate);
+ self::updateCount($lastDate, $n);
+
+ $counts[$lastDate] = $n;
+
+ for ($d = self::incrementDay($lastDate); $d <= $today; $d = self::incrementDay($d)) {
+ $n = self::getCount($d);
+ self::insertCount($d, $n);
+ }
+
+ return $counts;
+ }
+
+ static function updateToday()
+ {
+ $today = self::today();
+
+ $n = self::getCount($today);
+ self::updateCount($today, $n);
+
+ return $n;
+ }
+
+ static function getCount($d)
+ {
+ $notice = new Notice();
+ $notice->whereAdd('created BETWEEN "'.$d.' 00:00:00" AND "'.self::incrementDay($d).' 00:00:00"');
+ $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
+ $n = $notice->count();
+
+ return $n;
+ }
+
+ static function insertCount($d, $n)
+ {
+ $snc = new Sitemap_notice_count();
+
+ $snc->notice_date = DB_DataObject_Cast::date($d);
+
+ $snc->notice_count = $n;
+ $snc->created = common_sql_now();
+ $snc->modified = $snc->created;
+
+ if (!$snc->insert()) {
+ common_log(LOG_WARNING, "Could not save user counts for '$d'");
+ }
+ }
+
+ static function updateCount($d, $n)
+ {
+ $snc = Sitemap_notice_count::staticGet('notice_date', DB_DataObject_Cast::date($d));
+
+ if (empty($snc)) {
+ throw new Exception("No such registration date: $d");
+ }
+
+ $orig = clone($snc);
+
+ $snc->notice_date = DB_DataObject_Cast::date($d);
+
+ $snc->notice_count = $n;
+ $snc->created = common_sql_now();
+ $snc->modified = $snc->created;
+
+ if (!$snc->update($orig)) {
+ common_log(LOG_WARNING, "Could not save user counts for '$d'");
+ }
+ }
+
+ static function incrementDay($d)
+ {
+ $dt = self::dateStrToInt($d);
+ return self::dateIntToStr($dt + 24 * 60 * 60);
+ }
+
+ static function dateStrToInt($d)
+ {
+ return strtotime($d.' 00:00:00');
+ }
+
+ static function dateIntToStr($dt)
+ {
+ return date('Y-m-d', $dt);
+ }
+
+ static function getFirstDate()
+ {
+ $n = new Notice();
+
+ $n->selectAdd();
+ $n->selectAdd('date(min(created)) as first_date');
+
+ if ($n->find(true)) {
+ return $n->first_date;
+ } else {
+ // Is this right?
+ return self::dateIntToStr(time());
+ }
+ }
+
+ static function today()
+ {
+ return self::dateIntToStr(time());
+ }
+}
diff --git a/plugins/Sitemap/Sitemap_user_count.php b/plugins/Sitemap/Sitemap_user_count.php
new file mode 100644
index 000000000..64b4c3442
--- /dev/null
+++ b/plugins/Sitemap/Sitemap_user_count.php
@@ -0,0 +1,284 @@
+<?php
+/**
+ * Data class for counting user registrations by date
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for counting users by date
+ *
+ * We make a separate sitemap for each user registered by date.
+ * To save ourselves some processing effort, we cache this data
+ *
+ * @category Action
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link http://status.net/
+ *
+ * @see DB_DataObject
+ */
+
+class Sitemap_user_count extends Memcached_DataObject
+{
+ public $__table = 'sitemap_user_count'; // table name
+
+ public $registration_date; // date primary_key not_null
+ public $user_count; // int(4)
+ public $created;
+ public $modified;
+
+ /**
+ * Get an instance by key
+ *
+ * This is a utility method to get a single instance with a given key value.
+ *
+ * @param string $k Key to use to lookup (usually 'user_id' for this class)
+ * @param mixed $v Value to lookup
+ *
+ * @return Sitemap_user_count object found, or null for no hits
+ *
+ */
+
+ function staticGet($k, $v=null)
+ {
+ return Memcached_DataObject::staticGet('Sitemap_user_count', $k, $v);
+ }
+
+ /**
+ * return table definition for DB_DataObject
+ *
+ * DB_DataObject needs to know something about the table to manipulate
+ * instances. This method provides all the DB_DataObject needs to know.
+ *
+ * @return array array of column definitions
+ */
+
+ function table()
+ {
+ return array('registration_date' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_NOTNULL,
+ 'user_count' => DB_DATAOBJECT_INT,
+ 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+ 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+ }
+
+ /**
+ * return key definitions for DB_DataObject
+ *
+ * DB_DataObject needs to know about keys that the table has; this function
+ * defines them.
+ *
+ * @return array key definitions
+ */
+
+ function keys()
+ {
+ return array('registration_date' => 'K');
+ }
+
+ function sequenceKey()
+ {
+ return array(false, false, false);
+ }
+
+ /**
+ * return key definitions for Memcached_DataObject
+ *
+ * Our caching system uses the same key definitions, but uses a different
+ * method to get them.
+ *
+ * @return array key definitions
+ */
+
+ function keyTypes()
+ {
+ return $this->keys();
+ }
+
+ static function getAll()
+ {
+ $userCounts = self::cacheGet('sitemap:user:counts');
+
+ if ($userCounts === false) {
+
+ $suc = new Sitemap_user_count();
+ $suc->orderBy('registration_date DESC');
+
+ // Fetch the first one to check up-to-date-itude
+
+ $n = $suc->find(true);
+
+ $today = self::today();
+ $userCounts = array();
+
+ if (!$n) { // No counts saved yet
+ $userCounts = self::initializeCounts();
+ } else if ($suc->registration_date < $today) { // There are counts but not up to today
+ $userCounts = self::fillInCounts($suc->registration_date);
+ } else if ($suc->registration_date == $today) { // Refresh today's
+ $userCounts[$today] = self::updateToday();
+ }
+
+ // starts with second-to-last date
+
+ while ($suc->fetch()) {
+ $userCounts[$suc->registration_date] = $suc->user_count;
+ }
+
+ self::cacheSet('sitemap:user:counts', $userCounts);
+ }
+
+ return $userCounts;
+ }
+
+ static function initializeCounts()
+ {
+ $firstDate = self::getFirstDate(); // awww
+ $today = self::today();
+
+ $counts = array();
+
+ for ($d = $firstDate; $d <= $today; $d = self::incrementDay($d)) {
+ $n = self::getCount($d);
+ self::insertCount($d, $n);
+ $counts[$d] = $n;
+ }
+
+ return $counts;
+ }
+
+ static function fillInCounts($lastDate)
+ {
+ $today = self::today();
+
+ $counts = array();
+
+ $n = self::getCount($lastDate);
+ self::updateCount($lastDate, $n);
+
+ $counts[$lastDate] = $n;
+
+ for ($d = self::incrementDay($lastDate); $d <= $today; $d = self::incrementDay($d)) {
+ $n = self::getCount($d);
+ self::insertCount($d, $n);
+ }
+
+ return $counts;
+ }
+
+ static function updateToday()
+ {
+ $today = self::today();
+
+ $n = self::getCount($today);
+ self::updateCount($today, $n);
+
+ return $n;
+ }
+
+ static function getCount($d)
+ {
+ $user = new User();
+ $user->whereAdd('created BETWEEN "'.$d.' 00:00:00" AND "'.self::incrementDay($d).' 00:00:00"');
+ $n = $user->count();
+
+ return $n;
+ }
+
+ static function insertCount($d, $n)
+ {
+ $suc = new Sitemap_user_count();
+
+ $suc->registration_date = DB_DataObject_Cast::date($d);
+ $suc->user_count = $n;
+ $suc->created = common_sql_now();
+ $suc->modified = $suc->created;
+
+ if (!$suc->insert()) {
+ common_log(LOG_WARNING, "Could not save user counts for '$d'");
+ }
+ }
+
+ static function updateCount($d, $n)
+ {
+ $suc = Sitemap_user_count::staticGet('registration_date', DB_DataObject_Cast::date($d));
+
+ if (empty($suc)) {
+ throw new Exception("No such registration date: $d");
+ }
+
+ $orig = clone($suc);
+
+ $suc->registration_date = DB_DataObject_Cast::date($d);
+ $suc->user_count = $n;
+ $suc->created = common_sql_now();
+ $suc->modified = $suc->created;
+
+ if (!$suc->update($orig)) {
+ common_log(LOG_WARNING, "Could not save user counts for '$d'");
+ }
+ }
+
+ static function incrementDay($d)
+ {
+ $dt = self::dateStrToInt($d);
+ return self::dateIntToStr($dt + 24 * 60 * 60);
+ }
+
+ static function dateStrToInt($d)
+ {
+ return strtotime($d.' 00:00:00');
+ }
+
+ static function dateIntToStr($dt)
+ {
+ return date('Y-m-d', $dt);
+ }
+
+ static function getFirstDate()
+ {
+ $u = new User();
+ $u->selectAdd();
+ $u->selectAdd('date(min(created)) as first_date');
+ if ($u->find(true)) {
+ return $u->first_date;
+ } else {
+ // Is this right?
+ return self::dateIntToStr(time());
+ }
+ }
+
+ static function today()
+ {
+ return self::dateIntToStr(time());
+ }
+}
diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php
new file mode 100644
index 000000000..7d9d2e5d6
--- /dev/null
+++ b/plugins/Sitemap/noticesitemap.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show list of user pages
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * sitemap for users
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class NoticesitemapAction extends SitemapAction
+{
+ var $notices = null;
+ var $j = 0;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ $y = $this->trimmed('year');
+
+ $m = $this->trimmed('month');
+ $d = $this->trimmed('day');
+
+ $i = $this->trimmed('index');
+
+ $y += 0;
+ $m += 0;
+ $d += 0;
+ $i += 0;
+
+ $this->notices = $this->getNotices($y, $m, $d, $i);
+ $this->j = 0;
+
+ return true;
+ }
+
+ function nextUrl()
+ {
+ if ($this->j < count($this->notices)) {
+ $n = $this->notices[$this->j];
+ $this->j++;
+ return array(common_local_url('shownotice', array('notice' => $n[0])),
+ common_date_w3dtf($n[1]),
+ 'never',
+ null);
+ } else {
+ return null;
+ }
+ }
+
+ function getNotices($y, $m, $d, $i)
+ {
+ $n = Notice::cacheGet("sitemap:notice:$y:$m:$d:$i");
+
+ if ($n === false) {
+
+ $notice = new Notice();
+
+ $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d);
+
+ // XXX: estimates 1d == 24h, which screws up days
+ // with leap seconds (1d == 24h + 1s). Thankfully they're
+ // few and far between.
+
+ $theend = strtotime($begindt) + (24 * 60 * 60);
+ $enddt = common_sql_date($theend);
+
+ $notice->selectAdd();
+ $notice->selectAdd('id, created');
+
+ $notice->whereAdd("created >= '$begindt'");
+ $notice->whereAdd("created < '$enddt'");
+
+ $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
+
+ $notice->orderBy('created');
+
+ $offset = ($i-1) * SitemapPlugin::NOTICES_PER_MAP;
+ $limit = SitemapPlugin::NOTICES_PER_MAP;
+
+ $notice->limit($offset, $limit);
+
+ $notice->find();
+
+ $n = array();
+
+ while ($notice->fetch()) {
+ $n[] = array($notice->id, $notice->created);
+ }
+
+ $c = Cache::instance();
+
+ if (!empty($c)) {
+ $c->set(Cache::key("sitemap:notice:$y:$m:$d:$i"),
+ $n,
+ Cache::COMPRESSED,
+ ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60)));
+ }
+ }
+
+ return $n;
+ }
+}
diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php
new file mode 100644
index 000000000..45edfccc5
--- /dev/null
+++ b/plugins/Sitemap/sitemapaction.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for sitemap-generating actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * superclass for sitemap actions
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class SitemapAction extends Action
+{
+ /**
+ * handle the action
+ *
+ * @param array $args unused.
+ *
+ * @return void
+ */
+
+ function handle($args)
+ {
+ header('Content-Type: text/xml; charset=UTF-8');
+ $this->startXML();
+
+ $this->elementStart('urlset', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9'));
+
+ while (list($url, $lm, $cf, $p) = $this->nextUrl()) {
+ $this->showUrl($url, $lm, $cf, $p);
+ }
+
+ $this->elementEnd('urlset');
+
+ $this->endXML();
+ }
+
+ function showUrl($url, $lastMod=null, $changeFreq=null, $priority=null)
+ {
+ $this->elementStart('url');
+ $this->element('loc', null, $url);
+ if (!is_null($lastMod)) {
+ $this->element('lastmod', null, $lastMod);
+ }
+ if (!is_null($changeFreq)) {
+ $this->element('changefreq', null, $changeFreq);
+ }
+ if (!is_null($priority)) {
+ $this->element('priority', null, $priority);
+ }
+ $this->elementEnd('url');
+ }
+
+ function nextUrl()
+ {
+ return null;
+ }
+
+ function isReadOnly()
+ {
+ return true;
+ }
+}
diff --git a/plugins/Sitemap/sitemapadminpanel.php b/plugins/Sitemap/sitemapadminpanel.php
new file mode 100644
index 000000000..3c295b08e
--- /dev/null
+++ b/plugins/Sitemap/sitemapadminpanel.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Sitemap administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Administer sitemap settings
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class SitemapadminpanelAction extends AdminPanelAction
+{
+ /**
+ * Returns the page title
+ *
+ * @return string page title
+ */
+
+ function title()
+ {
+ return _('Sitemap');
+ }
+
+ /**
+ * Instructions for using this form.
+ *
+ * @return string instructions
+ */
+
+ function getInstructions()
+ {
+ return _('Sitemap settings for this StatusNet site');
+ }
+
+ /**
+ * Show the site admin panel form
+ *
+ * @return void
+ */
+
+ function showForm()
+ {
+ $form = new SitemapAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save settings from the form
+ *
+ * @return void
+ */
+
+ function saveSettings()
+ {
+ static $settings = array('sitemap' => array('googlekey', 'yahookey', 'bingkey'));
+
+ $values = array();
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting] = $this->trimmed($setting);
+ }
+ }
+
+ // This throws an exception on validation errors
+
+ $this->validate($values);
+
+ // assert(all values are valid);
+
+ $config = new Config();
+
+ $config->query('BEGIN');
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ Config::save($section, $setting, $values[$section][$setting]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ function validate(&$values)
+ {
+ }
+}
+
+/**
+ * Form for the sitemap admin panel
+ */
+
+class SitemapAdminPanelForm extends AdminForm
+{
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+
+ function id()
+ {
+ return 'form_sitemap_admin_panel';
+ }
+
+ /**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_sitemap';
+ }
+
+ /**
+ * Action of the form
+ *
+ * @return string URL of the action
+ */
+
+ function action()
+ {
+ return common_local_url('sitemapadminpanel');
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $this->out->elementStart('fieldset', array('id' => 'sitemap_admin'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $this->input('googlekey',
+ _('Google key'),
+ _('Google Webmaster Tools verification key'),
+ 'sitemap');
+ $this->unli();
+ $this->li();
+ $this->input('yahookey',
+ _('Yahoo key'),
+ _('Yahoo! Site Explorer verification key'),
+ 'sitemap');
+ $this->unli();
+ $this->li();
+ $this->input('bingkey',
+ _('Bing key'),
+ _('Bing Webmaster Tools verification key'),
+ 'sitemap');
+ $this->unli();
+ $this->out->elementEnd('ul');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit('submit', _('Save'), 'submit', null, _('Save sitemap settings'));
+ }
+}
diff --git a/plugins/Sitemap/sitemapindex.php b/plugins/Sitemap/sitemapindex.php
new file mode 100644
index 000000000..169e3031c
--- /dev/null
+++ b/plugins/Sitemap/sitemapindex.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Generate sitemap index
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Show the sitemap index
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class SitemapindexAction extends Action
+{
+ /**
+ * handle the action
+ *
+ * @param array $args unused.
+ *
+ * @return void
+ */
+
+ function handle($args)
+ {
+ header('Content-Type: text/xml; charset=UTF-8');
+ $this->startXML();
+
+ $this->elementStart('sitemapindex', array('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9'));
+
+ $this->showNoticeSitemaps();
+ $this->showUserSitemaps();
+
+ $this->elementEnd('sitemapindex');
+
+ $this->endXML();
+ }
+
+ function showUserSitemaps()
+ {
+ $userCounts = Sitemap_user_count::getAll();
+
+ foreach ($userCounts as $dt => $cnt) {
+ $cnt = $cnt+0;
+
+ if ($cnt == 0) {
+ continue;
+ }
+
+ $n = (int)$cnt / (int)SitemapPlugin::USERS_PER_MAP;
+ if (($cnt % SitemapPlugin::USERS_PER_MAP) != 0) {
+ $n++;
+ }
+ for ($i = 1; $i <= $n; $i++) {
+ $this->showSitemap('user', $dt, $i);
+ }
+ }
+ }
+
+ function showNoticeSitemaps()
+ {
+ $noticeCounts = Sitemap_notice_count::getAll();
+
+ foreach ($noticeCounts as $dt => $cnt) {
+ if ($cnt == 0) {
+ continue;
+ }
+ $n = $cnt / SitemapPlugin::NOTICES_PER_MAP;
+ if ($cnt % SitemapPlugin::NOTICES_PER_MAP) {
+ $n++;
+ }
+ for ($i = 1; $i <= $n; $i++) {
+ $this->showSitemap('notice', $dt, $i);
+ }
+ }
+ }
+
+ function showSitemap($prefix, $dt, $i)
+ {
+ list($y, $m, $d) = explode('-', $dt);
+
+ $this->elementStart('sitemap');
+ $this->element('loc', null, common_local_url($prefix.'sitemap',
+ array('year' => $y,
+ 'month' => $m,
+ 'day' => $d,
+ 'index' => $i)));
+
+ $begdate = strtotime("$y-$m-$d 00:00:00");
+ $enddate = $begdate + (24 * 60 * 60);
+
+ if ($enddate < time()) {
+ $this->element('lastmod', null, date(DATE_W3C, $enddate));
+ }
+
+ $this->elementEnd('sitemap');
+ }
+}
diff --git a/plugins/Sitemap/usersitemap.php b/plugins/Sitemap/usersitemap.php
new file mode 100644
index 000000000..de1200715
--- /dev/null
+++ b/plugins/Sitemap/usersitemap.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show list of user pages
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * sitemap for users
+ *
+ * @category Sitemap
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class UsersitemapAction extends SitemapAction
+{
+ var $users = null;
+ var $j = 0;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ $y = $this->trimmed('year');
+
+ $m = $this->trimmed('month');
+ $d = $this->trimmed('day');
+
+ $i = $this->trimmed('index');
+
+ $y += 0;
+ $m += 0;
+ $d += 0;
+ $i += 0;
+
+ $this->users = $this->getUsers($y, $m, $d, $i);
+ $this->j = 0;
+ return true;
+ }
+
+ function nextUrl()
+ {
+ if ($this->j < count($this->users)) {
+ $nickname = $this->users[$this->j];
+ $this->j++;
+ return array(common_profile_url($nickname), null, null, '1.0');
+ } else {
+ return null;
+ }
+ }
+
+ function getUsers($y, $m, $d, $i)
+ {
+ $u = User::cacheGet("sitemap:user:$y:$m:$d:$i");
+
+ if ($u === false) {
+
+ $user = new User();
+
+ $begindt = sprintf('%04d-%02d-%02d 00:00:00', $y, $m, $d);
+
+ // XXX: estimates 1d == 24h, which screws up days
+ // with leap seconds (1d == 24h + 1s). Thankfully they're
+ // few and far between.
+
+ $theend = strtotime($begindt) + (24 * 60 * 60);
+ $enddt = common_sql_date($theend);
+
+ $user->selectAdd();
+ $user->selectAdd('nickname');
+ $user->whereAdd("created >= '$begindt'");
+ $user->whereAdd("created < '$enddt'");
+
+ $user->orderBy('created');
+
+ $offset = ($i-1) * SitemapPlugin::USERS_PER_MAP;
+ $limit = SitemapPlugin::USERS_PER_MAP;
+
+ $user->limit($offset, $limit);
+
+ $user->find();
+
+ while ($user->fetch()) {
+ $u[] = $user->nickname;
+ }
+
+ $c = Cache::instance();
+
+ if (!empty($c)) {
+ $c->set(Cache::key("sitemap:user:$y:$m:$d:$i"),
+ $u,
+ Cache::COMPRESSED,
+ ((time() > $theend) ? (time() + 90 * 24 * 60 * 60) : (time() + 5 * 60)));
+ }
+ }
+
+ return $u;
+ }
+}
diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php
index bf89c478c..46e329d8a 100644
--- a/plugins/TabFocus/TabFocusPlugin.php
+++ b/plugins/TabFocus/TabFocusPlugin.php
@@ -23,7 +23,7 @@
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @author Paul Irish <paul.irish@isobar.net>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot
new file mode 100644
index 000000000..3b0e3c261
--- /dev/null
+++ b/plugins/TabFocus/locale/TabFocus.pot
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: TabFocusPlugin.php:54
+msgid ""
+"TabFocus changes the notice form behavior so that, while in the text area, "
+"pressing the tab key focuses the \"Send\" button, matching the behavor of "
+"Twitter."
+msgstr ""
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index f242db6c8..8fd645945 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -22,7 +22,7 @@
* @category Plugin
* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot
new file mode 100644
index 000000000..10f59a1e8
--- /dev/null
+++ b/plugins/TightUrl/locale/TightUrl.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: TightUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 1a0a69682..65b3a6b38 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -221,7 +221,7 @@ class TwitterBridgePlugin extends Plugin
*/
function onStartEnqueueNotice($notice, &$transports)
{
- if (self::hasKeys()) {
+ if (self::hasKeys() && $notice->isLocal()) {
// Avoid a possible loop
if ($notice->source != 'twitter') {
array_push($transports, 'twitter');
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 7c624fdb3..03a4bd3f3 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -186,7 +186,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$timeline = null;
try {
- $timeline = $client->statusesFriendsTimeline();
+ $timeline = $client->statusesHomeTimeline();
} catch (Exception $e) {
common_log(LOG_WARNING, $this->name() .
' - Twitter client unable to get friends timeline for user ' .
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index eff125579..c7ac8053c 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"POT-Creation-Date: 2010-04-29 23:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: twitter.php:320
+#: twitter.php:342
msgid "Your Twitter bridge has been disabled."
msgstr ""
-#: twitter.php:324
+#: twitter.php:346
#, php-format
msgid ""
"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -36,28 +36,97 @@ msgid ""
"%3$s\n"
msgstr ""
-#: twitterauthorization.php:181 twitterauthorization.php:229
-msgid "Couldn't link your Twitter account."
+#: TwitterBridgePlugin.php:155 TwitterBridgePlugin.php:178
+#: TwitterBridgePlugin.php:291 twitteradminpanel.php:54
+msgid "Twitter"
msgstr ""
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#: TwitterBridgePlugin.php:156
+msgid "Login or register using Twitter"
msgstr ""
-#: TwitterBridgePlugin.php:114
-msgid "Twitter"
+#: TwitterBridgePlugin.php:179
+msgid "Twitter integration options"
msgstr ""
-#: TwitterBridgePlugin.php:115
-msgid "Twitter integration options"
+#: TwitterBridgePlugin.php:292
+msgid "Twitter bridge configuration"
msgstr ""
-#: TwitterBridgePlugin.php:207
+#: TwitterBridgePlugin.php:317
msgid ""
"The Twitter \"bridge\" plugin allows you to integrate your StatusNet "
"instance with <a href=\"http://twitter.com/\">Twitter</a>."
msgstr ""
+#: twitteradminpanel.php:65
+msgid "Twitter bridge settings"
+msgstr ""
+
+#: twitteradminpanel.php:148
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:154
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:207
+msgid "Twitter application settings"
+msgstr ""
+
+#: twitteradminpanel.php:213
+msgid "Consumer key"
+msgstr ""
+
+#: twitteradminpanel.php:214
+msgid "Consumer key assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:222
+msgid "Consumer secret"
+msgstr ""
+
+#: twitteradminpanel.php:223
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:240
+msgid "Integration source"
+msgstr ""
+
+#: twitteradminpanel.php:241
+msgid "Name of your Twitter application"
+msgstr ""
+
+#: twitteradminpanel.php:253
+msgid "Options"
+msgstr ""
+
+#: twitteradminpanel.php:260
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+#: twitteradminpanel.php:262
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+#: twitteradminpanel.php:268
+msgid "Enable Twitter import"
+msgstr ""
+
+#: twitteradminpanel.php:270
+msgid "Allow users to import their Twitter friends' timelines"
+msgstr ""
+
+#: twitterauthorization.php:181 twitterauthorization.php:229
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:201
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
#: twittersettings.php:59
msgid "Twitter settings"
msgstr ""
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 21adc7a90..896eee2da 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -335,10 +335,10 @@ function remove_twitter_link($flink)
function mail_twitter_bridge_removed($user)
{
- common_init_locale($user->language);
-
$profile = $user->getProfile();
+ common_switch_locale($user->language);
+
$subject = sprintf(_m('Your Twitter bridge has been disabled.'));
$site_name = common_config('site', 'name');
@@ -354,7 +354,7 @@ function mail_twitter_bridge_removed($user)
common_local_url('twittersettings'),
common_config('site', 'name'));
- common_init_locale();
+ common_switch_locale();
return mail_to_user($user, $subject, $body);
}
diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index 2c18c9469..23828ed4a 100644
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Class for doing OAuth calls against Twitter
+ * Class for doing HTTP basic auth calls against Twitter
*
* PHP version 5
*
@@ -126,6 +126,35 @@ class TwitterBasicAuthClient
}
/**
+ * Calls Twitter's /statuses/home_timeline API method
+ *
+ * @param int $since_id show statuses after this id
+ * @param int $max_id show statuses before this id
+ * @param int $cnt number of statuses to show
+ * @param int $page page number
+ *
+ * @return mixed an array of statuses similar to friends timeline but including retweets
+ */
+ function statusesHomeTimeline($since_id = null, $max_id = null,
+ $cnt = null, $page = null)
+ {
+ $url = 'https://twitter.com/statuses/home_timeline.json';
+ $params = array('since_id' => $since_id,
+ 'max_id' => $max_id,
+ 'count' => $cnt,
+ 'page' => $page);
+ $qry = http_build_query($params);
+
+ if (!empty($qry)) {
+ $url .= "?$qry";
+ }
+
+ $response = $this->httpRequest($url);
+ $statuses = json_decode($response);
+ return $statuses;
+ }
+
+ /**
* Calls Twitter's /statuses/friends API method
*
* @param int $id id of the user whom you wish to see friends of
diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php
index d895d8c73..f6ef78675 100644
--- a/plugins/TwitterBridge/twitteroauthclient.php
+++ b/plugins/TwitterBridge/twitteroauthclient.php
@@ -218,6 +218,36 @@ class TwitterOAuthClient extends OAuthClient
}
/**
+ * Calls Twitter's /statuses/home_timeline API method
+ *
+ * @param int $since_id show statuses after this id
+ * @param int $max_id show statuses before this id
+ * @param int $cnt number of statuses to show
+ * @param int $page page number
+ *
+ * @return mixed an array of statuses, similar to friends_timeline but including retweets
+ */
+ function statusesHomeTimeline($since_id = null, $max_id = null,
+ $cnt = null, $page = null)
+ {
+
+ $url = 'https://twitter.com/statuses/home_timeline.json';
+ $params = array('since_id' => $since_id,
+ 'max_id' => $max_id,
+ 'count' => $cnt,
+ 'page' => $page);
+ $qry = http_build_query($params);
+
+ if (!empty($qry)) {
+ $url .= "?$qry";
+ }
+
+ $response = $this->oAuthGet($url);
+ $statuses = json_decode($response);
+ return $statuses;
+ }
+
+ /**
* Calls Twitter's /statuses/friends API method
*
* @param int $id id of the user whom you wish to see friends of
diff --git a/plugins/UserFlag/clearflag.php b/plugins/UserFlag/clearflag.php
index bd6732e2d..f032527ed 100644
--- a/plugins/UserFlag/clearflag.php
+++ b/plugins/UserFlag/clearflag.php
@@ -81,7 +81,7 @@ class ClearflagAction extends ProfileFormAction
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();
if (!$this->boolean('ajax')) {
- $this->returnToArgs();
+ $this->returnToPrevious();
}
}
}
diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php
index 2d0f0abb9..018c1e8ac 100644
--- a/plugins/UserFlag/flagprofile.php
+++ b/plugins/UserFlag/flagprofile.php
@@ -87,7 +87,7 @@ class FlagprofileAction extends ProfileFormAction
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();
if (!$this->boolean('ajax')) {
- $this->returnToArgs();
+ $this->returnToPrevious();
}
}
}
diff --git a/plugins/WikiHowProfile/README b/plugins/WikiHowProfile/README
new file mode 100644
index 000000000..ee6096c9f
--- /dev/null
+++ b/plugins/WikiHowProfile/README
@@ -0,0 +1,6 @@
+This is an additional plugin which piggybacks on OpenID authentication to pull
+profile information from WikiHow user pages when creating or updating accounts.
+
+WikiHow runs a customized MediaWiki setup, with locally-built extensions to add
+profile features such as an avatar. As this additional info isn't yet exposed
+through OpenID, we need to pull it separately.
diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php
new file mode 100644
index 000000000..b72bd55d6
--- /dev/null
+++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Plugin to pull WikiHow-style user avatars at OpenID setup time.
+ * These are not currently exposed via OpenID.
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugins
+ * @package StatusNet
+ * @author Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ // This check helps protect against security problems;
+ // your code file can't be executed directly from the web.
+ exit(1);
+}
+
+/**
+ * Sample plugin main class
+ *
+ * Each plugin requires a main class to interact with the StatusNet system.
+ *
+ * @category Plugins
+ * @package WikiHowProfilePlugin
+ * @author Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link http://status.net/
+ */
+
+class WikiHowProfilePlugin extends Plugin
+{
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'WikiHow avatar fetcher',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Brion Vibber',
+ 'homepage' => 'http://status.net/wiki/Plugin:Sample',
+ 'rawdescription' =>
+ _m('Fetches avatar and other profile info for WikiHow users when setting up an account via OpenID.'));
+ return true;
+ }
+
+ /**
+ * Hook for OpenID user creation; we'll pull the avatar.
+ *
+ * @param User $user
+ * @param string $canonical OpenID provider URL
+ * @param array $sreg query data from provider
+ */
+ function onEndOpenIDCreateNewUser($user, $canonical, $sreg)
+ {
+ $this->updateProfile($user, $canonical);
+ return true;
+ }
+
+ /**
+ * Hook for OpenID profile updating; we'll pull the avatar.
+ *
+ * @param User $user
+ * @param string $canonical OpenID provider URL (wiki profile page)
+ * @param array $sreg query data from provider
+ */
+ function onEndOpenIDUpdateUser($user, $canonical, $sreg)
+ {
+ $this->updateProfile($user, $canonical);
+ return true;
+ }
+
+ /**
+ * @param User $user
+ * @param string $canonical OpenID provider URL (wiki profile page)
+ */
+ private function updateProfile($user, $canonical)
+ {
+ $prefix = 'http://www.wikihow.com/User:';
+
+ if (substr($canonical, 0, strlen($prefix)) == $prefix) {
+ // Yes, it's a WikiHow user!
+ $profile = $this->fetchProfile($canonical);
+
+ if (!empty($profile['avatar'])) {
+ $this->saveAvatar($user, $profile['avatar']);
+ }
+ }
+ }
+
+ /**
+ * Given a user's WikiHow profile URL, find their avatar.
+ *
+ * @param string $profileUrl user page on the wiki
+ *
+ * @return array of data; possible members:
+ * 'avatar' => full URL to avatar image
+ *
+ * @throws Exception on various low-level failures
+ *
+ * @todo pull location, web site, and about sections -- they aren't currently marked up cleanly.
+ */
+ private function fetchProfile($profileUrl)
+ {
+ $client = HTTPClient::start();
+ $response = $client->get($profileUrl);
+ if (!$response->isOk()) {
+ throw new Exception("WikiHow profile page fetch failed.");
+ // HTTP error response already logged.
+ return false;
+ }
+
+ // Suppress warnings during HTML parsing; non-well-formed bits will
+ // spew horrible warning everywhere even though it works fine.
+ $old = error_reporting();
+ error_reporting($old & ~E_WARNING);
+
+ $dom = new DOMDocument();
+ $ok = $dom->loadHTML($response->getBody());
+
+ error_reporting($old);
+
+ if (!$ok) {
+ throw new Exception("HTML parse failure during check for WikiHow avatar.");
+ return false;
+ }
+
+ $data = array();
+
+ $avatar = $dom->getElementById('avatarULimg');
+ if ($avatar) {
+ $src = $avatar->getAttribute('src');
+
+ $base = new Net_URL2($profileUrl);
+ $absolute = $base->resolve($src);
+ $avatarUrl = strval($absolute);
+
+ common_log(LOG_DEBUG, "WikiHow avatar found for $profileUrl - $avatarUrl");
+ $data['avatar'] = $avatarUrl;
+ }
+
+ return $data;
+ }
+
+ /**
+ * Actually save the avatar we found locally.
+ *
+ * @param User $user
+ * @param string $url to avatar URL
+ * @todo merge wrapper funcs for this into common place for 1.0 core
+ */
+ private function saveAvatar($user, $url)
+ {
+ if (!common_valid_http_url($url)) {
+ throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url));
+ }
+
+ // @fixme this should be better encapsulated
+ // ripped from OStatus via oauthstore.php (for old OMB client)
+ $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
+ if (!copy($url, $temp_filename)) {
+ throw new ServerException(sprintf(_m("Unable to fetch avatar from %s"), $url));
+ }
+
+ $profile = $user->getProfile();
+ $id = $profile->id;
+ // @fixme should we be using different ids?
+
+ $imagefile = new ImageFile($id, $temp_filename);
+ $filename = Avatar::filename($id,
+ image_type_to_extension($imagefile->type),
+ null,
+ common_timestamp());
+ rename($temp_filename, Avatar::path($filename));
+ $profile->setOriginal($filename);
+ }
+
+}
+
diff --git a/plugins/Xmpp/Fake_XMPP.php b/plugins/Xmpp/Queued_XMPP.php
index 0f7cfd3b4..73eff2246 100644
--- a/plugins/Xmpp/Fake_XMPP.php
+++ b/plugins/Xmpp/Queued_XMPP.php
@@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Instead of sending XMPP messages, retrieve the raw XML that would be sent
+ * Queue-mediated proxy class for outgoing XMPP messages.
*
* PHP version 5
*
@@ -31,13 +31,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-class Fake_XMPP extends XMPPHP_XMPP
+class Queued_XMPP extends XMPPHP_XMPP
{
- public $would_be_sent = null;
+ /**
+ * Reference to the XmppPlugin object we're hooked up to.
+ */
+ public $plugin;
/**
* Constructor
*
+ * @param XmppPlugin $plugin
* @param string $host
* @param integer $port
* @param string $user
@@ -47,8 +51,10 @@ class Fake_XMPP extends XMPPHP_XMPP
* @param boolean $printlog
* @param string $loglevel
*/
- public function __construct($host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
+ public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
{
+ $this->plugin = $plugin;
+
parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
// We use $host to connect, but $server to build JIDs if specified.
@@ -73,7 +79,7 @@ class Fake_XMPP extends XMPPHP_XMPP
*/
public function send($msg, $timeout=NULL)
{
- $this->would_be_sent = $msg;
+ $this->plugin->enqueue_outgoing_raw($msg);
}
//@{
@@ -110,5 +116,6 @@ class Fake_XMPP extends XMPPHP_XMPP
throw new Exception("Can't read stream from fake XMPP.");
}
//@}
+
}
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 03bf47fea..66468b5f2 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
exit(1);
}
-set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/XMPPHP');
-
/**
* Plugin for XMPP
*
@@ -60,8 +58,6 @@ class XmppPlugin extends ImPlugin
public $transport = 'xmpp';
- protected $fake_xmpp;
-
function getDisplayName(){
return _m('XMPP/Jabber/GTalk');
}
@@ -289,10 +285,10 @@ class XmppPlugin extends ImPlugin
switch ($cls)
{
case 'XMPPHP_XMPP':
- require_once 'XMPP.php';
+ require_once $dir . '/extlib/XMPPHP/XMPP.php';
return false;
case 'Sharing_XMPP':
- case 'Fake_XMPP':
+ case 'Queued_XMPP':
require_once $dir . '/'.$cls.'.php';
return false;
case 'XmppManager':
@@ -317,9 +313,7 @@ class XmppPlugin extends ImPlugin
function send_message($screenname, $body)
{
- $this->fake_xmpp->message($screenname, $body, 'chat');
- $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent);
- return true;
+ $this->queuedConnection()->message($screenname, $body, 'chat');
}
function send_notice($screenname, $notice)
@@ -327,8 +321,7 @@ class XmppPlugin extends ImPlugin
$msg = $this->format_notice($notice);
$entry = $this->format_entry($notice);
- $this->fake_xmpp->message($screenname, $msg, 'chat', null, $entry);
- $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent);
+ $this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry);
return true;
}
@@ -376,19 +369,28 @@ class XmppPlugin extends ImPlugin
$from = $this->normalize($pl['from']);
if ($pl['type'] != 'chat') {
- common_log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from.");
- return true;
+ $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString());
+ return;
}
if (mb_strlen($pl['body']) == 0) {
- common_log(LOG_WARNING, "Ignoring message with empty body from $from.");
- return true;
+ $this->log(LOG_WARNING, "Ignoring message with empty body from $from: " . $pl['xml']->toString());
+ return;
}
- return $this->handle_incoming($from, $pl['body']);
+ $this->handle_incoming($from, $pl['body']);
+
+ return true;
}
- function initialize(){
+ /**
+ * Build a queue-proxied XMPP interface object. Any outgoing messages
+ * will be run back through us for enqueing rather than sent directly.
+ *
+ * @return Queued_XMPP
+ * @throws Exception if server settings are invalid.
+ */
+ function queuedConnection(){
if(!isset($this->server)){
throw new Exception("must specify a server");
}
@@ -402,7 +404,7 @@ class XmppPlugin extends ImPlugin
throw new Exception("must specify a password");
}
- $this->fake_xmpp = new Fake_XMPP($this->host ?
+ return new Queued_XMPP($this, $this->host ?
$this->host :
$this->server,
$this->port,
@@ -415,7 +417,6 @@ class XmppPlugin extends ImPlugin
$this->debug ?
XMPPHP_Log::LEVEL_VERBOSE : null
);
- return true;
}
function onPluginVersion(&$versions)
diff --git a/extlib/XMPPHP/BOSH.php b/plugins/Xmpp/extlib/XMPPHP/BOSH.php
index befaf60a7..befaf60a7 100644
--- a/extlib/XMPPHP/BOSH.php
+++ b/plugins/Xmpp/extlib/XMPPHP/BOSH.php
diff --git a/extlib/XMPPHP/Exception.php b/plugins/Xmpp/extlib/XMPPHP/Exception.php
index da59bc791..da59bc791 100644
--- a/extlib/XMPPHP/Exception.php
+++ b/plugins/Xmpp/extlib/XMPPHP/Exception.php
diff --git a/extlib/XMPPHP/Log.php b/plugins/Xmpp/extlib/XMPPHP/Log.php
index a9bce3d84..a9bce3d84 100644
--- a/extlib/XMPPHP/Log.php
+++ b/plugins/Xmpp/extlib/XMPPHP/Log.php
diff --git a/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php
index 2e459e2a2..2e459e2a2 100644
--- a/extlib/XMPPHP/Roster.php
+++ b/plugins/Xmpp/extlib/XMPPHP/Roster.php
diff --git a/extlib/XMPPHP/XMLObj.php b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php
index 0d3e21991..0d3e21991 100644
--- a/extlib/XMPPHP/XMLObj.php
+++ b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php
diff --git a/extlib/XMPPHP/XMLStream.php b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
index d33411ec5..d33411ec5 100644
--- a/extlib/XMPPHP/XMLStream.php
+++ b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
diff --git a/extlib/XMPPHP/XMPP.php b/plugins/Xmpp/extlib/XMPPHP/XMPP.php
index 429f45e56..c0f896339 100644
--- a/extlib/XMPPHP/XMPP.php
+++ b/plugins/Xmpp/extlib/XMPPHP/XMPP.php
@@ -171,7 +171,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
$body = htmlspecialchars($body);
$subject = htmlspecialchars($subject);
- $out = "<message from='{$this->fulljid}' to='$to' type='$type'>";
+ $out = "<message from=\"{$this->fulljid}\" to=\"$to\" type='$type'>";
if($subject) $out .= "<subject>$subject</subject>";
$out .= "<body>$body</body>";
if($payload) $out .= $payload;
@@ -194,7 +194,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
if($show == 'unavailable') $type = 'unavailable';
$out = "<presence";
- if($to) $out .= " to='$to'";
+ if($to) $out .= " to=\"$to\"";
if($type) $out .= " type='$type'";
if($show == 'available' and !$status) {
$out .= "/>";
diff --git a/extlib/XMPPHP/XMPP_Old.php b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php
index 43f56b154..43f56b154 100644
--- a/extlib/XMPPHP/XMPP_Old.php
+++ b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php
diff --git a/scripts/apidocs.config b/scripts/apidocs.config
new file mode 100644
index 000000000..fdbe35ba1
--- /dev/null
+++ b/scripts/apidocs.config
@@ -0,0 +1,1551 @@
+# Doxyfile 1.6.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = "StatusNet REST API"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = ../apidocs
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = NO
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = NO
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = NO
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = NO
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = NO
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = NO
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= NO
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = NO
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = NO
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = ../actions ../lib
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = api*.php
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS = *Action Api* if*
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 9029bb19d..a475e11d0 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -123,6 +123,10 @@ require_once INSTALLDIR . '/lib/common.php';
set_error_handler('common_error_handler');
+// Set up the language infrastructure so we can localize anything that
+// needs to be sent out to users, such as mail notifications.
+common_init_language();
+
function _make_matches($opt, $alt)
{
$matches = array();
diff --git a/scripts/docgen.php b/scripts/docgen.php
index 78bbe37d8..ac0a5c83d 100755
--- a/scripts/docgen.php
+++ b/scripts/docgen.php
@@ -17,10 +17,30 @@ Options:
ENDOFHELP;
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-require_once INSTALLDIR.'/scripts/commandline.inc';
+set_include_path(INSTALLDIR . DIRECTORY_SEPARATOR . 'extlib' . PATH_SEPARATOR . get_include_path());
$pattern = "*.php *.inc";
$exclude = 'config.php */extlib/* */local/* */plugins/* */scripts/*';
+$plugin = false;
+
+require_once 'Console/Getopt.php';
+$parser = new Console_Getopt();
+$result = $parser->getopt($_SERVER['argv'], $shortoptions, $longoptions);
+if (PEAR::isError($result)) {
+ print $result->getMessage() . "\n";
+ exit(1);
+}
+list($options, $args) = $result;
+
+foreach ($options as $option) {
+ $arg = $option[0];
+ if ($arg == '--plugin') {
+ $plugin = $options[1];
+ } else if ($arg == 'h' || $arg == '--help') {
+ print $helptext;
+ exit(0);
+ }
+}
if (isset($args[0])) {
$outdir = $args[0];
@@ -33,8 +53,7 @@ if (isset($args[0])) {
exit(1);
}
-if (have_option('p', 'plugin')) {
- $plugin = get_option_value('plugin');
+if ($plugin) {
$exclude = "*/extlib/*";
$indir = INSTALLDIR . "/plugins/" . $plugin;
if (!is_dir($indir)) {
@@ -51,8 +70,19 @@ if (have_option('p', 'plugin')) {
$indir = INSTALLDIR;
}
+function getVersion()
+{
+ // define('STATUSNET_VERSION', '0.9.1');
+ $source = file_get_contents(INSTALLDIR . '/lib/common.php');
+ if (preg_match('/^\s*define\s*\(\s*[\'"]STATUSNET_VERSION[\'"]\s*,\s*[\'"](.*)[\'"]\s*\)\s*;/m', $source, $matches)) {
+ return $matches[1];
+ }
+ return 'unknown';
+}
+
+
$replacements = array(
- '%%version%%' => STATUSNET_VERSION,
+ '%%version%%' => getVersion(),
'%%indir%%' => $indir,
'%%pattern%%' => $pattern,
'%%outdir%%' => $outdir,
diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index 4563da914..378478d74 100644
--- a/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -32,6 +32,18 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
$this->assertEquals('tag:versioncentral.example.org,2009:/change/1643245', $act->objects[0]->id);
}
+ public function testExample2()
+ {
+ global $_example2;
+ $dom = DOMDocument::loadXML($_example2);
+ $act = new Activity($dom->documentElement);
+
+ $this->assertFalse(empty($act));
+ // Did we handle <content type="html"> correctly with a typical payload?
+ $this->assertEquals("<p>Geraldine posted a Photo on PhotoPanic</p>\n " .
+ "<img src=\"/geraldine/photo1.jpg\">", trim($act->content));
+ }
+
public function testExample3()
{
global $_example3;
@@ -305,6 +317,71 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
}
+ public function testAtomContent()
+ {
+ $tests = array(array("<content>Some regular plain text.</content>",
+ "Some regular plain text."),
+ array("<content>&lt;b&gt;this is not HTML&lt;/b&gt;</content>",
+ "&lt;b&gt;this is not HTML&lt;/b&gt;"),
+ array("<content type='html'>Some regular plain HTML.</content>",
+ "Some regular plain HTML."),
+ array("<content type='html'>&lt;b&gt;this is too HTML&lt;/b&gt;</content>",
+ "<b>this is too HTML</b>"),
+ array("<content type='html'>&amp;lt;b&amp;gt;but this is not HTML!&amp;lt;/b&amp;gt;</content>",
+ "&lt;b&gt;but this is not HTML!&lt;/b&gt;"),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>Some regular plain XHTML.</div></content>",
+ "Some regular plain XHTML."),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'><b>This is some XHTML!</b></div></content>",
+ "<b>This is some XHTML!</b>"),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>&lt;b&gt;This is not some XHTML!&lt;/b&gt;</div></content>",
+ "&lt;b&gt;This is not some XHTML!&lt;/b&gt;"),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>&amp;lt;b&amp;gt;This is not some XHTML either!&amp;lt;/b&amp;gt;</div></content>",
+ "&amp;lt;b&amp;gt;This is not some XHTML either!&amp;lt;/b&amp;gt;"));
+ foreach ($tests as $data) {
+ list($source, $output) = $data;
+ $xml = "<entry xmlns='http://www.w3.org/2005/Atom'>" .
+ "<id>http://example.com/fakeid</id>" .
+ "<author><name>Test</name></author>" .
+ "<title>Atom content tests</title>" .
+ $source .
+ "</entry>";
+ $dom = DOMDocument::loadXML($xml);
+ $act = new Activity($dom->documentElement);
+
+ $this->assertFalse(empty($act));
+ $this->assertEquals($output, trim($act->content));
+ }
+ }
+
+ public function testRssContent()
+ {
+ $tests = array(array("<content:encoded>Some regular plain HTML.</content:encoded>",
+ "Some regular plain HTML."),
+ array("<content:encoded>Some &lt;b&gt;exciting bold HTML&lt;/b&gt;</content:encoded>",
+ "Some <b>exciting bold HTML</b>"),
+ array("<content:encoded>Some &amp;lt;b&amp;gt;escaped non-HTML.&amp;lt;/b&amp;gt;</content:encoded>",
+ "Some &lt;b&gt;escaped non-HTML.&lt;/b&gt;"),
+ array("<description>Some plain text.</description>",
+ "Some plain text."),
+ array("<description>Some &lt;b&gt;non-HTML text&lt;/b&gt;</description>",
+ "Some &lt;b&gt;non-HTML text&lt;/b&gt;"),
+ array("<description>Some &amp;lt;b&amp;gt;double-escaped text&amp;lt;/b&amp;gt;</description>",
+ "Some &amp;lt;b&amp;gt;double-escaped text&amp;lt;/b&amp;gt;"));
+ foreach ($tests as $data) {
+ list($source, $output) = $data;
+ $xml = "<item xmlns:content='http://purl.org/rss/1.0/modules/content/'>" .
+ "<guid>http://example.com/fakeid</guid>" .
+ "<title>RSS content tests</title>" .
+ $source .
+ "</item>";
+ $dom = DOMDocument::loadXML($xml);
+ $act = new Activity($dom->documentElement);
+
+ $this->assertFalse(empty($act));
+ $this->assertEquals($output, trim($act->content));
+ }
+ }
+
}
$_example1 = <<<EXAMPLE1
diff --git a/tests/MediaFileTest.php b/tests/MediaFileTest.php
new file mode 100644
index 000000000..a76a4f45e
--- /dev/null
+++ b/tests/MediaFileTest.php
@@ -0,0 +1,96 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('STATUSNET', true);
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class MediaFileTest extends PHPUnit_Framework_TestCase
+{
+
+ public function setup()
+ {
+ $this->old_attachments_supported = common_config('attachments', 'supported');
+ $GLOBALS['config']['attachments']['supported'] = true;
+ }
+
+ public function tearDown()
+ {
+ $GLOBALS['config']['attachments']['supported'] = $this->old_attachments_supported;
+ }
+
+ /**
+ * @dataProvider fileTypeCases
+ *
+ */
+ public function testFileType($filename, $expectedType)
+ {
+ if (!file_exists($filename)) {
+ throw new Exception("WTF? $filename test file missing");
+ }
+
+ $type = MediaFile::getUploadedFileType($filename, basename($filename));
+ $this->assertEquals($expectedType, $type);
+ }
+
+ /**
+ * @dataProvider fileTypeCases
+ *
+ */
+ public function testUploadedFileType($filename, $expectedType)
+ {
+ if (!file_exists($filename)) {
+ throw new Exception("WTF? $filename test file missing");
+ }
+ $tmp = tmpfile();
+ fwrite($tmp, file_get_contents($filename));
+
+ $type = MediaFile::getUploadedFileType($tmp, basename($filename));
+ $this->assertEquals($expectedType, $type);
+ }
+
+ static public function fileTypeCases()
+ {
+ $base = dirname(__FILE__);
+ $dir = "$base/sample-uploads";
+ $files = array(
+ "image.png" => "image/png",
+ "image.gif" => "image/gif",
+ "image.jpg" => "image/jpeg",
+ "image.jpeg" => "image/jpeg",
+
+ "office.pdf" => "application/pdf",
+
+ "wordproc.odt" => "application/vnd.oasis.opendocument.text",
+ "wordproc.ott" => "application/vnd.oasis.opendocument.text-template",
+ "wordproc.doc" => "application/msword",
+ "wordproc.docx" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ "wordproc.rtf" => "text/rtf",
+
+ "spreadsheet.ods" => "application/vnd.oasis.opendocument.spreadsheet",
+ "spreadsheet.ots" => "application/vnd.oasis.opendocument.spreadsheet-template",
+ "spreadsheet.xls" => "application/vnd.ms-excel",
+ "spreadsheet.xlt" => "application/vnd.ms-excel",
+ "spreadsheet.xlsx" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+
+ "presentation.odp" => "application/vnd.oasis.opendocument.presentation",
+ "presentation.otp" => "application/vnd.oasis.opendocument.presentation-template",
+ "presentation.ppt" => "application/vnd.ms-powerpoint",
+ "presentation.pptx" => "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ );
+
+ $dataset = array();
+ foreach ($files as $file => $type) {
+ $dataset[] = array("$dir/$file", $type);
+ }
+ return $dataset;
+ }
+
+}
+
diff --git a/tests/sample-uploads/image.gif b/tests/sample-uploads/image.gif
new file mode 100644
index 000000000..b636f4b8d
--- /dev/null
+++ b/tests/sample-uploads/image.gif
Binary files differ
diff --git a/tests/sample-uploads/image.jpeg b/tests/sample-uploads/image.jpeg
new file mode 100644
index 000000000..21fcb5aef
--- /dev/null
+++ b/tests/sample-uploads/image.jpeg
Binary files differ
diff --git a/tests/sample-uploads/image.jpg b/tests/sample-uploads/image.jpg
new file mode 100644
index 000000000..21fcb5aef
--- /dev/null
+++ b/tests/sample-uploads/image.jpg
Binary files differ
diff --git a/tests/sample-uploads/image.png b/tests/sample-uploads/image.png
new file mode 100644
index 000000000..60cbcfd17
--- /dev/null
+++ b/tests/sample-uploads/image.png
Binary files differ
diff --git a/tests/sample-uploads/office.pdf b/tests/sample-uploads/office.pdf
new file mode 100644
index 000000000..670bc2343
--- /dev/null
+++ b/tests/sample-uploads/office.pdf
Binary files differ
diff --git a/tests/sample-uploads/presentation.odp b/tests/sample-uploads/presentation.odp
new file mode 100644
index 000000000..8dd3a428b
--- /dev/null
+++ b/tests/sample-uploads/presentation.odp
Binary files differ
diff --git a/tests/sample-uploads/presentation.otp b/tests/sample-uploads/presentation.otp
new file mode 100644
index 000000000..1927ee79d
--- /dev/null
+++ b/tests/sample-uploads/presentation.otp
Binary files differ
diff --git a/tests/sample-uploads/presentation.pot b/tests/sample-uploads/presentation.pot
new file mode 100644
index 000000000..f5124ffa2
--- /dev/null
+++ b/tests/sample-uploads/presentation.pot
Binary files differ
diff --git a/tests/sample-uploads/presentation.potm b/tests/sample-uploads/presentation.potm
new file mode 100644
index 000000000..ade1bcb10
--- /dev/null
+++ b/tests/sample-uploads/presentation.potm
Binary files differ
diff --git a/tests/sample-uploads/presentation.ppt b/tests/sample-uploads/presentation.ppt
new file mode 100644
index 000000000..f5124ffa2
--- /dev/null
+++ b/tests/sample-uploads/presentation.ppt
Binary files differ
diff --git a/tests/sample-uploads/presentation.pptx b/tests/sample-uploads/presentation.pptx
new file mode 100644
index 000000000..21ea61a15
--- /dev/null
+++ b/tests/sample-uploads/presentation.pptx
Binary files differ
diff --git a/tests/sample-uploads/spreadsheet.ods b/tests/sample-uploads/spreadsheet.ods
new file mode 100644
index 000000000..7b43e7507
--- /dev/null
+++ b/tests/sample-uploads/spreadsheet.ods
Binary files differ
diff --git a/tests/sample-uploads/spreadsheet.ots b/tests/sample-uploads/spreadsheet.ots
new file mode 100644
index 000000000..5f830e6de
--- /dev/null
+++ b/tests/sample-uploads/spreadsheet.ots
Binary files differ
diff --git a/tests/sample-uploads/spreadsheet.xls b/tests/sample-uploads/spreadsheet.xls
new file mode 100644
index 000000000..2d470e687
--- /dev/null
+++ b/tests/sample-uploads/spreadsheet.xls
Binary files differ
diff --git a/tests/sample-uploads/spreadsheet.xlsx b/tests/sample-uploads/spreadsheet.xlsx
new file mode 100644
index 000000000..b97a551f8
--- /dev/null
+++ b/tests/sample-uploads/spreadsheet.xlsx
Binary files differ
diff --git a/tests/sample-uploads/spreadsheet.xlt b/tests/sample-uploads/spreadsheet.xlt
new file mode 100644
index 000000000..980423b20
--- /dev/null
+++ b/tests/sample-uploads/spreadsheet.xlt
Binary files differ
diff --git a/tests/sample-uploads/wordproc.doc b/tests/sample-uploads/wordproc.doc
new file mode 100644
index 000000000..81c5e34c6
--- /dev/null
+++ b/tests/sample-uploads/wordproc.doc
Binary files differ
diff --git a/tests/sample-uploads/wordproc.docx b/tests/sample-uploads/wordproc.docx
new file mode 100644
index 000000000..04ea3c3ec
--- /dev/null
+++ b/tests/sample-uploads/wordproc.docx
Binary files differ
diff --git a/tests/sample-uploads/wordproc.odt b/tests/sample-uploads/wordproc.odt
new file mode 100644
index 000000000..fa6fe5e9f
--- /dev/null
+++ b/tests/sample-uploads/wordproc.odt
Binary files differ
diff --git a/tests/sample-uploads/wordproc.ott b/tests/sample-uploads/wordproc.ott
new file mode 100644
index 000000000..99ca8c068
--- /dev/null
+++ b/tests/sample-uploads/wordproc.ott
Binary files differ
diff --git a/tests/sample-uploads/wordproc.rtf b/tests/sample-uploads/wordproc.rtf
new file mode 100644
index 000000000..aad2c4605
--- /dev/null
+++ b/tests/sample-uploads/wordproc.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\deff0\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset128 Times New Roman;}{\f1\froman\fprq2\fcharset128 Times New Roman;}{\f2\fswiss\fprq2\fcharset128 Arial;}{\f3\fnil\fprq2\fcharset128 DejaVu Sans;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang1081\ltrch\dbch\af3\langfe2052\hich\f0\fs24\lang1033\loch\f0\fs24\lang1033\snext1 Normal;}
+{\s2\sb240\sa120\keepn\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\afs28\lang1081\ltrch\dbch\langfe2052\hich\f2\fs28\lang1033\loch\f2\fs28\lang1033\sbasedon1\snext3 Heading;}
+{\s3\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang1081\ltrch\dbch\af3\langfe2052\hich\f0\fs24\lang1033\loch\f0\fs24\lang1033\sbasedon1\snext3 Body Text;}
+{\s4\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang1081\ltrch\dbch\af3\langfe2052\hich\f0\fs24\lang1033\loch\f0\fs24\lang1033\sbasedon3\snext4 List;}
+{\s5\sb120\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang1081\ai\ltrch\dbch\af3\langfe2052\hich\f0\fs24\lang1033\i\loch\f0\fs24\lang1033\i\sbasedon1\snext5 caption;}
+{\s6\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang1081\ltrch\dbch\af3\langfe2052\hich\f0\fs24\lang1033\loch\f0\fs24\lang1033\sbasedon1\snext6 Index;}
+}
+{\info{\author Brion }{\creatim\yr2010\mo5\dy10\hr15\min2}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment StarWriter}{\vern3200}}\deftab709
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Standard;}}
+\paperh15840\paperw12240\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang1081\ltrch\dbch\af3\langfe2052\hich\f0\fs24\lang1033\loch\f0\fs24\lang1033
+\par } \ No newline at end of file