summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt2
-rw-r--r--actions/all.php1
-rw-r--r--actions/allrss.php2
-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.php10
-rw-r--r--actions/apigrouplistall.php2
-rw-r--r--actions/apigroupmembership.php1
-rw-r--r--actions/apigroupshow.php1
-rw-r--r--actions/apistatusesdestroy.php1
-rw-r--r--actions/apistatusesshow.php1
-rw-r--r--actions/apistatusesupdate.php92
-rw-r--r--actions/apitimelinefavorites.php1
-rw-r--r--actions/apitimelinefriends.php99
-rw-r--r--actions/apitimelinegroup.php1
-rw-r--r--actions/apitimelinehome.php2
-rw-r--r--actions/apitimelinementions.php1
-rw-r--r--actions/apitimelinepublic.php90
-rw-r--r--actions/apitimelinetag.php1
-rw-r--r--actions/apitimelineuser.php1
-rw-r--r--actions/block.php16
-rw-r--r--actions/confirmaddress.php2
-rw-r--r--actions/deleteapplication.php10
-rw-r--r--actions/deletenotice.php16
-rw-r--r--actions/deleteuser.php16
-rw-r--r--actions/designadminpanel.php3
-rw-r--r--actions/emailsettings.php75
-rw-r--r--actions/geocode.php1
-rw-r--r--actions/groupblock.php16
-rw-r--r--actions/grouprss.php2
-rw-r--r--actions/imsettings.php59
-rw-r--r--actions/invite.php2
-rw-r--r--actions/oembed.php1
-rw-r--r--actions/publicxrds.php3
-rw-r--r--actions/register.php2
-rw-r--r--actions/shownotice.php2
-rw-r--r--actions/smssettings.php74
-rw-r--r--actions/snapshotadminpanel.php2
-rw-r--r--actions/tag.php13
-rw-r--r--actions/usergroups.php2
-rw-r--r--actions/userrss.php4
-rw-r--r--actions/version.php2
-rw-r--r--classes/File.php4
-rw-r--r--classes/Notice.php6
-rw-r--r--classes/Safe_DataObject.php24
-rw-r--r--classes/Subscription.php8
-rw-r--r--config.php.sample2
-rw-r--r--db/08to09_pg.sql39
-rw-r--r--db/statusnet_pg.sql91
-rw-r--r--index.php3
-rw-r--r--install.php1
-rw-r--r--lib/accountsettingsaction.php30
-rw-r--r--lib/action.php54
-rw-r--r--lib/activity.php3
-rw-r--r--lib/adminpanelaction.php11
-rw-r--r--lib/apiaction.php66
-rw-r--r--lib/apiauth.php24
-rw-r--r--lib/apibareauth.php3
-rw-r--r--lib/apiprivateauth.php1
-rw-r--r--lib/applicationeditform.php41
-rw-r--r--lib/applicationlist.php17
-rw-r--r--lib/atomgroupnoticefeed.php3
-rw-r--r--lib/atomusernoticefeed.php3
-rw-r--r--lib/attachmentlist.php3
-rw-r--r--lib/authenticationplugin.php1
-rw-r--r--lib/authorizationplugin.php5
-rw-r--r--lib/command.php36
-rw-r--r--lib/htmloutputter.php1
-rw-r--r--lib/installer.php1
-rw-r--r--lib/language.php6
-rw-r--r--lib/mailhandler.php4
-rw-r--r--lib/mediafile.php2
-rw-r--r--lib/noticeform.php4
-rw-r--r--lib/noticelist.php12
-rw-r--r--lib/pgsqlschema.php55
-rw-r--r--lib/popularnoticesection.php2
-rw-r--r--lib/profileaction.php12
-rw-r--r--lib/util.php20
-rw-r--r--lib/xrdsoutputter.php1
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po515
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po1588
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po507
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po572
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po504
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po503
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po499
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po566
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po681
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po498
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po501
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po583
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po500
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po500
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po500
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po501
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po623
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po507
-rw-r--r--locale/statusnet.pot493
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po498
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po566
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po511
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po497
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po497
-rw-r--r--plugins/AutoSandbox/AutoSandboxPlugin.php96
-rw-r--r--plugins/AutoSandbox/LICENSE21
-rw-r--r--plugins/AutoSandbox/README39
-rw-r--r--plugins/Autocomplete/AutocompletePlugin.php15
-rw-r--r--plugins/Autocomplete/autocomplete.php1
-rw-r--r--plugins/BitlyUrl/BitlyUrlPlugin.php2
-rw-r--r--plugins/CasAuthentication/CasAuthenticationPlugin.php2
-rw-r--r--plugins/ClientSideShorten/ClientSideShortenPlugin.php79
-rw-r--r--plugins/ClientSideShorten/README6
-rw-r--r--plugins/ClientSideShorten/shorten.js66
-rw-r--r--plugins/ClientSideShorten/shorten.php69
-rw-r--r--plugins/DirectionDetector/DirectionDetectorPlugin.php32
-rw-r--r--plugins/DirectionDetector/locale/DirectionDetector.pot6
-rw-r--r--plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po22
-rw-r--r--plugins/EmailAuthentication/EmailAuthenticationPlugin.php2
-rw-r--r--plugins/FirePHP/FirePHPPlugin.php12
-rw-r--r--plugins/Imap/ImapPlugin.php4
-rw-r--r--plugins/Imap/imapmanager.php2
-rw-r--r--plugins/InfiniteScroll/InfiniteScrollPlugin.php2
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php288
-rw-r--r--plugins/LdapAuthorization/LdapAuthorizationPlugin.php135
-rw-r--r--plugins/LdapCommon/LdapCommon.php369
-rw-r--r--plugins/LdapCommon/MemcacheSchemaCache.php (renamed from plugins/LdapAuthentication/MemcacheSchemaCache.php)2
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2.php (renamed from extlib/Net/LDAP2.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/Entry.php (renamed from extlib/Net/LDAP2/Entry.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/Filter.php (renamed from extlib/Net/LDAP2/Filter.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php (renamed from extlib/Net/LDAP2/LDIF.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php (renamed from extlib/Net/LDAP2/RootDSE.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/Schema.php (renamed from extlib/Net/LDAP2/Schema.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php (renamed from extlib/Net/LDAP2/SchemaCache.interface.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/Search.php (renamed from extlib/Net/LDAP2/Search.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php (renamed from extlib/Net/LDAP2/SimpleFileSchemaCache.php)0
-rw-r--r--plugins/LdapCommon/extlib/Net/LDAP2/Util.php (renamed from extlib/Net/LDAP2/Util.php)0
-rw-r--r--plugins/LilUrl/LilUrlPlugin.php2
-rw-r--r--plugins/Mapstraction/allmap.php1
-rw-r--r--plugins/Mapstraction/map.php1
-rw-r--r--plugins/Mapstraction/usermap.php1
-rw-r--r--plugins/MemcachedPlugin.php8
-rw-r--r--plugins/Minify/MinifyPlugin.php1
-rw-r--r--plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po109
-rw-r--r--plugins/OpenID/OpenIDPlugin.php19
-rw-r--r--plugins/OpenID/finishaddopenid.php10
-rw-r--r--plugins/OpenID/finishopenidlogin.php35
-rw-r--r--plugins/OpenID/openid.php15
-rw-r--r--plugins/OpenID/openidlogin.php15
-rw-r--r--plugins/OpenID/openidserver.php8
-rw-r--r--plugins/PtitUrl/PtitUrlPlugin.php2
-rw-r--r--plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php5
-rw-r--r--plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php2
-rw-r--r--plugins/SimpleUrl/SimpleUrlPlugin.php2
-rw-r--r--plugins/SpotifyPlugin.php113
-rw-r--r--plugins/TabFocus/TabFocusPlugin.php2
-rw-r--r--plugins/TightUrl/TightUrlPlugin.php2
-rw-r--r--plugins/UrlShortener/UrlShortenerPlugin.php1
-rw-r--r--scripts/apidocs.config1551
-rwxr-xr-xscripts/docgen.php114
-rw-r--r--scripts/doxygen.tmpl1516
-rwxr-xr-xscripts/update_translations.php4
180 files changed, 16624 insertions, 10589 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index 2da6f3da6..cf9c6123f 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -141,7 +141,7 @@ StartLogout: Before logging out
EndLogout: After logging out
- $action: the logout action
-ArgsInitialized: After the argument array has been initialized
+ArgsInitialize: After the argument array has been initialized
- $args: associative array of arguments, can be modified
StartAddressData: Allows the site owner to provide additional information about themselves for contact (e.g., tagline, email, location)
diff --git a/actions/all.php b/actions/all.php
index a977fce95..a6738863b 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -27,6 +27,7 @@
* @author Craig Andrews <candrews@integralblue.com>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@controlyourself.ca>
+ * @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/allrss.php b/actions/allrss.php
index 01e737ad7..7df0b1ef7 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -112,10 +112,12 @@ class AllrssAction extends Rss10Action
$c = array('url' => common_local_url('allrss',
array('nickname' =>
$user->nickname)),
+ // TRANS: Message is used as link title. %s is a user nickname.
'title' => sprintf(_('%s and friends'), $user->nickname),
'link' => common_local_url('all',
array('nickname' =>
$user->nickname)),
+ // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
'description' => sprintf(_('Updates from %1$s and friends on %2$s!'),
$user->nickname, common_config('site', 'name')));
return $c;
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 dd2a68c66..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/
*/
@@ -93,6 +94,7 @@ class ApiGroupListAction extends ApiBareAuthAction
parent::handle($args);
$sitename = common_config('site', 'name');
+ // TRANS: %s is a user name
$title = sprintf(_("%s's groups"), $this->user->nickname);
$taguribase = TagURI::base();
$id = "tag:$taguribase:Groups";
@@ -100,10 +102,12 @@ class ApiGroupListAction extends ApiBareAuthAction
'usergroups',
array('nickname' => $this->user->nickname)
);
+
$subtitle = sprintf(
- _("Groups %1\$s is a member of on %2\$s."),
- $this->user->nickname,
- $sitename
+ // TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+ _("%1\$s groups %2\$s is a member of."),
+ $sitename,
+ $this->user->nickname
);
switch($this->format) {
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index f7677970f..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/
*/
@@ -87,6 +88,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
parent::handle($args);
$sitename = common_config('site', 'name');
+ // TRANS: Message is used as a title. %s is a site name.
$title = sprintf(_("%s groups"), $sitename);
$taguribase = TagURI::base();
$id = "tag:$taguribase:Groups";
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/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/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 0bfcdd060..8d9469063 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/
*/
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 e3e579b0d..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);
}
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index a889b4918..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/
*/
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 9c6ffcf9c..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);
}
@@ -116,6 +212,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$id = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
$subtitle = sprintf(
+ // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
_('Updates from %1$s and friends on %2$s!'),
$this->user->nickname,
$sitename
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 76fa74767..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/
*/
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 2a6b7bf5c..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/
*/
@@ -117,6 +118,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
$id = "tag:$taguribase:HomeTimeline:" . $this->user->id;
$subtitle = sprintf(
+ // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
_('Updates from %1$s and friends on %2$s!'),
$this->user->nickname, $sitename
);
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index dc39122e5..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/
*/
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 49062e603..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
{
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index c21b22702..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/
*/
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 9ee6abaf5..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/
*/
diff --git a/actions/block.php b/actions/block.php
index 239a50868..93f8ec937 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -148,8 +148,20 @@ class BlockAction extends ProfileFormAction
$this->hidden($k, $v);
}
}
- $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
- $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user'));
+ $this->submit('form_action-no',
+ // TRANS: Button label on the user block form.
+ _m('BUTTON','No'),
+ 'submit form_action-primary',
+ 'no',
+ // TRANS: Submit button title for 'No' when blocking a user.
+ _('Do not block this user'));
+ $this->submit('form_action-yes',
+ // TRANS: Button label on the user block form.
+ _m('BUTTON','Yes'),
+ 'submit form_action-secondary',
+ 'yes',
+ // TRANS: Submit button title for 'Yes' when blocking a user.
+ _('Block this user'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index dc17499f5..8bf8c8c4d 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -87,10 +87,12 @@ class ConfirmaddressAction extends Action
}
$type = $confirm->address_type;
if (!in_array($type, array('email', 'jabber', 'sms'))) {
+ // TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
$this->serverError(sprintf(_('Unrecognized address type %s.'), $type));
return;
}
if ($cur->$type == $confirm->address) {
+ // TRANS: Client error for an already confirmed email/jabbel/sms address.
$this->clientError(_('That address has already been confirmed.'));
return;
}
diff --git a/actions/deleteapplication.php b/actions/deleteapplication.php
index 17526e111..806de0be6 100644
--- a/actions/deleteapplication.php
+++ b/actions/deleteapplication.php
@@ -150,13 +150,17 @@ class DeleteapplicationAction extends Action
'This will clear all data about the application from the '.
'database, including all existing user connections.'));
$this->submit('form_action-no',
- _('No'),
+ // TRANS: Button label on the delete application form.
+ _m('BUTTON','No'),
'submit form_action-primary',
'no',
- _("Do not delete this application"));
+ // TRANS: Submit button title for 'No' when deleting an application.
+ _('Do not delete this application'));
$this->submit('form_action-yes',
- _('Yes'),
+ // TRANS: Button label on the delete application form.
+ _m('BUTTON','Yes'),
'submit form_action-secondary',
+ // TRANS: Submit button title for 'Yes' when deleting an application.
'yes', _('Delete this application'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 69cb1ebe8..f8010a814 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -142,8 +142,20 @@ class DeletenoticeAction extends Action
$this->hidden('token', common_session_token());
$this->hidden('notice', $this->trimmed('notice'));
$this->element('p', null, _('Are you sure you want to delete this notice?'));
- $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice"));
- $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice'));
+ $this->submit('form_action-no',
+ // TRANS: Button label on the delete notice form.
+ _m('BUTTON','No'),
+ 'submit form_action-primary',
+ 'no',
+ // TRANS: Submit button title for 'No' when deleting a notice.
+ _("Do not delete this notice"));
+ $this->submit('form_action-yes',
+ // TRANS: Button label on the delete notice form.
+ _m('BUTTON','Yes'),
+ 'submit form_action-secondary',
+ 'yes',
+ // TRANS: Submit button title for 'Yes' when deleting a notice.
+ _('Delete this notice'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index c0a8b20e2..02ded68b3 100644
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -147,8 +147,20 @@ class DeleteuserAction extends ProfileFormAction
}
Event::handle('EndDeleteUserForm', array($this, $this->user));
}
- $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
- $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user'));
+ $this->submit('form_action-no',
+ // TRANS: Button label on the delete user form.
+ _m('BUTTON','No'),
+ 'submit form_action-primary',
+ 'no',
+ // TRANS: Submit button title for 'No' when deleting a user.
+ _('Do not block this user'));
+ $this->submit('form_action-yes',
+ // TRANS: Button label on the delete user form.
+ _m('BUTTON','Yes'),
+ 'submit form_action-secondary',
+ 'yes',
+ // TRANS: Submit button title for 'Yes' when deleting a user.
+ _('Delete this user'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 41d917e3c..8c08581b5 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -59,6 +59,7 @@ class DesignadminpanelAction extends AdminPanelAction
function title()
{
+ // TRANS: Message used as title for design settings for the site.
return _('Design');
}
@@ -454,6 +455,7 @@ class DesignAdminPanelForm extends AdminForm
$this->out->element('label', array('for' => 'design_background-image_on',
'class' => 'radio'),
+ // TRANS: Used as radio button label to add a background image.
_('On'));
$attrs = array('name' => 'design_background-image_onoff',
@@ -470,6 +472,7 @@ class DesignAdminPanelForm extends AdminForm
$this->out->element('label', array('for' => 'design_background-image_off',
'class' => 'radio'),
+ // TRANS: Used as radio button label to not add a background image.
_('Off'));
$this->out->element('p', 'form_guide', _('Turn background image on or off.'));
$this->unli();
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 08608348c..6138a88f9 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -57,6 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction
function title()
{
+ // TRANS: Title for e-mail settings.
return _('Email settings');
}
@@ -68,6 +69,10 @@ class EmailsettingsAction extends AccountSettingsAction
function getInstructions()
{
+ // XXX: For consistency of parameters in messages, this should be a
+ // regular parameters, replaced with sprintf().
+ // TRANS: E-mail settings page instructions.
+ // TRANS: %%site.name%% is the name of the site.
return _('Manage how you get email from %%site.name%%.');
}
@@ -97,102 +102,126 @@ class EmailsettingsAction extends AccountSettingsAction
common_local_url('emailsettings')));
$this->elementStart('fieldset');
$this->elementStart('fieldset', array('id' => 'settings_email_address'));
- $this->element('legend', null, _('Address'));
+ // TRANS: Form legend for e-mail settings form.
+ $this->element('legend', null, _('Email address'));
$this->hidden('token', common_session_token());
if ($user->email) {
$this->element('p', array('id' => 'form_confirmed'), $user->email);
+ // TRANS: Form note in e-mail settings form.
$this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
$this->hidden('email', $user->email);
- $this->submit('remove', _('Remove'));
+ // TRANS: Button label to remove a confirmed e-mail address.
+ $this->submit('remove', _m('BUTTON','Remove'));
} else {
$confirm = $this->getConfirmation();
if ($confirm) {
$this->element('p', array('id' => 'form_unconfirmed'), $confirm->address);
+ // TRANS: Form note in e-mail settings form.
$this->element('p', array('class' => 'form_note'),
_('Awaiting confirmation on this address. '.
'Check your inbox (and spam box!) for a message '.
'with further instructions.'));
$this->hidden('email', $confirm->address);
- $this->submit('cancel', _('Cancel'));
+ // TRANS: Button label to cancel an e-mail address confirmation procedure.
+ $this->submit('cancel', _m('BUTTON','Cancel'));
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label for e-mail address input in e-mail settings form.
$this->input('email', _('Email address'),
($this->arg('email')) ? $this->arg('email') : null,
+ // TRANS: Instructions for e-mail address input form.
_('Email address, like "UserName@example.org"'));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('add', _('Add'));
+ // TRANS: Button label for adding an e-mail address in e-mail settings form.
+ $this->submit('add', _m('BUTTON','Add'));
}
}
$this->elementEnd('fieldset');
if (common_config('emailpost', 'enabled') && $user->email) {
$this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
+ // TRANS: Form legend for incoming e-mail settings form.
$this->element('legend', null, _('Incoming email'));
if ($user->incomingemail) {
$this->elementStart('p');
$this->element('span', 'address', $user->incomingemail);
+ // XXX: Looks a little awkward in the UI.
+ // Something like "xxxx@identi.ca Send email ..". Needs improvement.
$this->element('span', 'input_instructions',
+ // TRANS: Form instructions for incoming e-mail form in e-mail settings.
_('Send email to this address to post new notices.'));
$this->elementEnd('p');
- $this->submit('removeincoming', _('Remove'));
+ // TRANS: Button label for removing a set sender e-mail address to post notices from.
+ $this->submit('removeincoming', _m('BUTTON','Remove'));
}
$this->elementStart('p');
$this->element('span', 'input_instructions',
+ // TRANS: Instructions for incoming e-mail address input form.
_('Make a new email address for posting to; '.
'cancels the old one.'));
$this->elementEnd('p');
- $this->submit('newincoming', _('New'));
+ // TRANS: Button label for adding an e-mail address to send notices from.
+ $this->submit('newincoming', _m('BUTTON','New'));
$this->elementEnd('fieldset');
}
$this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
- $this->element('legend', null, _('Preferences'));
+ // TRANS: Form legend for e-mail preferences form.
+ $this->element('legend', null, _('Email preferences'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('emailnotifysub',
+ // TRANS: Checkbox label in e-mail preferences form.
_('Send me notices of new subscriptions through email.'),
$user->emailnotifysub);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('emailnotifyfav',
+ // TRANS: Checkbox label in e-mail preferences form.
_('Send me email when someone '.
'adds my notice as a favorite.'),
$user->emailnotifyfav);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('emailnotifymsg',
+ // TRANS: Checkbox label in e-mail preferences form.
_('Send me email when someone sends me a private message.'),
$user->emailnotifymsg);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('emailnotifyattn',
+ // TRANS: Checkbox label in e-mail preferences form.
_('Send me email when someone sends me an "@-reply".'),
$user->emailnotifyattn);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('emailnotifynudge',
+ // TRANS: Checkbox label in e-mail preferences form.
_('Allow friends to nudge me and send me an email.'),
$user->emailnotifynudge);
$this->elementEnd('li');
if (common_config('emailpost', 'enabled')) {
$this->elementStart('li');
$this->checkbox('emailpost',
+ // TRANS: Checkbox label in e-mail preferences form.
_('I want to post notices by email.'),
$user->emailpost);
$this->elementEnd('li');
}
$this->elementStart('li');
$this->checkbox('emailmicroid',
+ // TRANS: Checkbox label in e-mail preferences form.
_('Publish a MicroID for my email address.'),
$user->emailmicroid);
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('save', _('Save'));
+ // TRANS: Button label to save e-mail preferences.
+ $this->submit('save', _m('BUTTON','Save'));
$this->elementEnd('fieldset');
$this->elementEnd('fieldset');
$this->elementEnd('form');
@@ -253,6 +282,7 @@ class EmailsettingsAction extends AccountSettingsAction
} else if ($this->arg('newincoming')) {
$this->newIncoming();
} else {
+ // TRANS: Message given submitting a form with an unknown action in e-mail settings.
$this->showForm(_('Unexpected form submission.'));
}
}
@@ -293,13 +323,15 @@ class EmailsettingsAction extends AccountSettingsAction
if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error updating e-mail preferences.
$this->serverError(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');
- $this->showForm(_('Preferences saved.'), true);
+ // TRANS: Confirmation message for successful e-mail preferences save.
+ $this->showForm(_('Email preferences saved.'), true);
}
/**
@@ -317,6 +349,7 @@ class EmailsettingsAction extends AccountSettingsAction
// Some validation
if (!$email) {
+ // TRANS: Message given saving e-mail address without having provided one.
$this->showForm(_('No email address.'));
return;
}
@@ -324,16 +357,20 @@ class EmailsettingsAction extends AccountSettingsAction
$email = common_canonical_email($email);
if (!$email) {
+ // TRANS: Message given saving e-mail address that cannot be normalised.
$this->showForm(_('Cannot normalize that email address'));
return;
}
if (!Validate::email($email, common_config('email', 'check_domain'))) {
+ // TRANS: Message given saving e-mail address that not valid.
$this->showForm(_('Not a valid email address.'));
return;
} else if ($user->email == $email) {
+ // TRANS: Message given saving e-mail address that is already set.
$this->showForm(_('That is already your email address.'));
return;
} else if ($this->emailExists($email)) {
+ // TRANS: Message given saving e-mail address that is already set for another user.
$this->showForm(_('That email address already belongs '.
'to another user.'));
return;
@@ -350,12 +387,14 @@ class EmailsettingsAction extends AccountSettingsAction
if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
+ // TRANS: Server error thrown on database error adding e-mail confirmation code.
$this->serverError(_('Couldn\'t insert confirmation code.'));
return;
}
mail_confirm_address($user, $confirm->code, $user->nickname, $email);
+ // TRANS: Message given saving valid e-mail address that is to be confirmed.
$msg = _('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.');
@@ -376,11 +415,13 @@ class EmailsettingsAction extends AccountSettingsAction
$confirm = $this->getConfirmation();
if (!$confirm) {
+ // TRANS: Message given canceling e-mail address confirmation that is not pending.
$this->showForm(_('No pending confirmation to cancel.'));
return;
}
if ($confirm->address != $email) {
- $this->showForm(_('That is the wrong IM address.'));
+ // TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+ $this->showForm(_('That is the wrong email address.'));
return;
}
@@ -388,11 +429,13 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
+ // TRANS: Server error thrown on database error canceling e-mail address confirmation.
$this->serverError(_('Couldn\'t delete email confirmation.'));
return;
}
- $this->showForm(_('Confirmation cancelled.'), true);
+ // TRANS: Message given after successfully canceling e-mail address confirmation.
+ $this->showForm(_('Email confirmation cancelled.'), true);
}
/**
@@ -410,6 +453,8 @@ class EmailsettingsAction extends AccountSettingsAction
// Maybe an old tab open...?
if ($user->email != $email) {
+ // TRANS: Message given trying to remove an e-mail address that is not
+ // TRANS: registered for the active user.
$this->showForm(_('That is not your email address.'));
return;
}
@@ -424,12 +469,14 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error removing a registered e-mail address.
$this->serverError(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');
- $this->showForm(_('The address was removed.'), true);
+ // TRANS: Message given after successfully removing a registered e-mail address.
+ $this->showForm(_('The email address was removed.'), true);
}
/**
@@ -453,9 +500,11 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error removing incoming e-mail address.
$this->serverError(_("Couldn't update user record."));
}
+ // TRANS: Message given after successfully removing an incoming e-mail address.
$this->showForm(_('Incoming email address removed.'), true);
}
@@ -475,9 +524,11 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error adding incoming e-mail address.
$this->serverError(_("Couldn't update user record."));
}
+ // TRANS: Message given after successfully adding an incoming e-mail address.
$this->showForm(_('New incoming email address added.'), true);
}
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 2e06dc324..39f783397 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -173,8 +173,20 @@ class GroupblockAction extends RedirectingAction
$this->hidden($k, $v);
}
}
- $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
- $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+ $this->submit('form_action-no',
+ // TRANS: Button label on the form to block a user from a group.
+ _m('BUTTON','No'),
+ 'submit form_action-primary',
+ 'no',
+ // TRANS: Submit button title for 'No' when blocking a user from a group.
+ _('Do not block this user from this group'));
+ $this->submit('form_action-yes',
+ // TRANS: Button label on the form to block a user from a group.
+ _m('BUTTON','Yes'),
+ 'submit form_action-secondary',
+ 'yes',
+ // TRANS: Submit button title for 'Yes' when blocking a user from a group.
+ _('Block this user from this group'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 490f6f945..98fdea38d 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -135,8 +135,10 @@ class groupRssAction extends Rss10Action
$c = array('url' => common_local_url('grouprss',
array('nickname' =>
$group->nickname)),
+ // TRANS: Message is used as link title. %s is a user nickname.
'title' => sprintf(_('%s timeline'), $group->nickname),
'link' => common_local_url('showgroup', array('nickname' => $group->nickname)),
+ // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
'description' => sprintf(_('Updates from members of %1$s on %2$s!'),
$group->nickname, common_config('site', 'name')));
return $c;
diff --git a/actions/imsettings.php b/actions/imsettings.php
index c3360fb12..6691c8dad 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -56,6 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction
function title()
{
+ // TRANS: Title for instance messaging settings.
return _('IM settings');
}
@@ -67,6 +68,9 @@ class ImsettingsAction extends ConnectSettingsAction
function getInstructions()
{
+ // TRANS: Instant messaging settings page instructions.
+ // TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+ // TRANS: the order and formatting of link text and link should remain unchanged.
return _('You can send and receive notices through '.
'Jabber/GTalk [instant messages](%%doc.im%%). '.
'Configure your address and settings below.');
@@ -86,6 +90,7 @@ class ImsettingsAction extends ConnectSettingsAction
{
if (!common_config('xmpp', 'enabled')) {
$this->element('div', array('class' => 'error'),
+ // TRANS: Message given in the IM settings if XMPP is not enabled on the site.
_('IM is not available.'));
return;
}
@@ -97,32 +102,41 @@ class ImsettingsAction extends ConnectSettingsAction
'action' =>
common_local_url('imsettings')));
$this->elementStart('fieldset', array('id' => 'settings_im_address'));
- $this->element('legend', null, _('Address'));
+ // TRANS: Form legend for IM settings form.
+ $this->element('legend', null, _('IM address'));
$this->hidden('token', common_session_token());
if ($user->jabber) {
$this->element('p', 'form_confirmed', $user->jabber);
+ // TRANS: Form note in IM settings form.
$this->element('p', 'form_note',
_('Current confirmed Jabber/GTalk address.'));
$this->hidden('jabber', $user->jabber);
- $this->submit('remove', _('Remove'));
+ // TRANS: Button label to remove a confirmed IM address.
+ $this->submit('remove', _m('BUTTON','Remove'));
} else {
$confirm = $this->getConfirmation();
if ($confirm) {
$this->element('p', 'form_unconfirmed', $confirm->address);
$this->element('p', 'form_note',
+ // TRANS: Form note in IM settings form.
+ // TRANS: %s is the IM address set for the site.
sprintf(_('Awaiting confirmation on this address. '.
'Check your Jabber/GTalk account for a '.
'message with further instructions. '.
'(Did you add %s to your buddy list?)'),
jabber_daemon_address()));
$this->hidden('jabber', $confirm->address);
- $this->submit('cancel', _('Cancel'));
+ // TRANS: Button label to cancel an IM address confirmation procedure.
+ $this->submit('cancel', _m('BUTTON','Cancel'));
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label for IM address input in IM settings form.
$this->input('jabber', _('IM address'),
($this->arg('jabber')) ? $this->arg('jabber') : null,
+ // TRANS: IM address input field instructions in IM settings form.
+ // TRANS: %s is the IM address set for the site.
sprintf(_('Jabber or GTalk address, '.
'like "UserName@example.org". '.
'First, make sure to add %s to your '.
@@ -130,37 +144,44 @@ class ImsettingsAction extends ConnectSettingsAction
jabber_daemon_address()));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('add', _('Add'));
+ // TRANS: Button label for adding an IM address in IM settings form.
+ $this->submit('add', _m('BUTTON','Add'));
}
}
$this->elementEnd('fieldset');
$this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
- $this->element('legend', null, _('Preferences'));
+ // TRANS: Form legend for IM preferences form.
+ $this->element('legend', null, _('IM preferences'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('jabbernotify',
+ // TRANS: Checkbox label in IM preferences form.
_('Send me notices through Jabber/GTalk.'),
$user->jabbernotify);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('updatefrompresence',
+ // TRANS: Checkbox label in IM preferences form.
_('Post a notice when my Jabber/GTalk status changes.'),
$user->updatefrompresence);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('jabberreplies',
+ // TRANS: Checkbox label in IM preferences form.
_('Send me replies through Jabber/GTalk '.
'from people I\'m not subscribed to.'),
$user->jabberreplies);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('jabbermicroid',
+ // TRANS: Checkbox label in IM preferences form.
_('Publish a MicroID for my Jabber/GTalk address.'),
$user->jabbermicroid);
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('save', _('Save'));
+ // TRANS: Button label to save IM preferences.
+ $this->submit('save', _m('BUTTON','Save'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
@@ -217,6 +238,7 @@ class ImsettingsAction extends ConnectSettingsAction
} else if ($this->arg('remove')) {
$this->removeAddress();
} else {
+ // TRANS: Message given submitting a form with an unknown action in IM settings.
$this->showForm(_('Unexpected form submission.'));
}
}
@@ -232,7 +254,6 @@ class ImsettingsAction extends ConnectSettingsAction
function savePreferences()
{
-
$jabbernotify = $this->boolean('jabbernotify');
$updatefrompresence = $this->boolean('updatefrompresence');
$jabberreplies = $this->boolean('jabberreplies');
@@ -255,12 +276,14 @@ class ImsettingsAction extends ConnectSettingsAction
if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error updating IM preferences.
$this->serverError(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');
+ // TRANS: Confirmation message for successful IM preferences save.
$this->showForm(_('Preferences saved.'), true);
}
@@ -282,6 +305,7 @@ class ImsettingsAction extends ConnectSettingsAction
// Some validation
if (!$jabber) {
+ // TRANS: Message given saving IM address without having provided one.
$this->showForm(_('No Jabber ID.'));
return;
}
@@ -289,16 +313,20 @@ class ImsettingsAction extends ConnectSettingsAction
$jabber = jabber_normalize_jid($jabber);
if (!$jabber) {
+ // TRANS: Message given saving IM address that cannot be normalised.
$this->showForm(_('Cannot normalize that Jabber ID'));
return;
}
if (!jabber_valid_base_jid($jabber, common_config('email', 'domain_check'))) {
+ // TRANS: Message given saving IM address that not valid.
$this->showForm(_('Not a valid Jabber ID'));
return;
} else if ($user->jabber == $jabber) {
+ // TRANS: Message given saving IM address that is already set.
$this->showForm(_('That is already your Jabber ID.'));
return;
} else if ($this->jabberExists($jabber)) {
+ // TRANS: Message given saving IM address that is already set for another user.
$this->showForm(_('Jabber ID already belongs to another user.'));
return;
}
@@ -316,6 +344,7 @@ class ImsettingsAction extends ConnectSettingsAction
if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
+ // TRANS: Server error thrown on database error adding IM confirmation code.
$this->serverError(_('Couldn\'t insert confirmation code.'));
return;
}
@@ -324,6 +353,8 @@ class ImsettingsAction extends ConnectSettingsAction
$user->nickname,
$jabber);
+ // TRANS: Message given saving valid IM address that is to be confirmed.
+ // TRANS: %s is the IM address set for the site.
$msg = sprintf(_('A confirmation code was sent '.
'to the IM address you added. '.
'You must approve %s for '.
@@ -348,10 +379,12 @@ class ImsettingsAction extends ConnectSettingsAction
$confirm = $this->getConfirmation();
if (!$confirm) {
+ // TRANS: Message given canceling IM address confirmation that is not pending.
$this->showForm(_('No pending confirmation to cancel.'));
return;
}
if ($confirm->address != $jabber) {
+ // TRANS: Message given canceling IM address confirmation for the wrong IM address.
$this->showForm(_('That is the wrong IM address.'));
return;
}
@@ -360,11 +393,13 @@ class ImsettingsAction extends ConnectSettingsAction
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
- $this->serverError(_('Couldn\'t delete email confirmation.'));
+ // TRANS: Server error thrown on database error canceling IM address confirmation.
+ $this->serverError(_('Couldn\'t delete IM confirmation.'));
return;
}
- $this->showForm(_('Confirmation cancelled.'), true);
+ // TRANS: Message given after successfully canceling IM address confirmation.
+ $this->showForm(_('IM confirmation cancelled.'), true);
}
/**
@@ -384,6 +419,8 @@ class ImsettingsAction extends ConnectSettingsAction
// Maybe an old tab open...?
if ($user->jabber != $jabber) {
+ // TRANS: Message given trying to remove an IM address that is not
+ // TRANS: registered for the active user.
$this->showForm(_('That is not your Jabber ID.'));
return;
}
@@ -398,6 +435,7 @@ class ImsettingsAction extends ConnectSettingsAction
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error removing a registered IM address.
$this->serverError(_('Couldn\'t update user.'));
return;
}
@@ -405,7 +443,8 @@ class ImsettingsAction extends ConnectSettingsAction
// XXX: unsubscribe to the old address
- $this->showForm(_('The address was removed.'), true);
+ // TRANS: Message given after successfully removing a registered IM address.
+ $this->showForm(_('The IM address was removed.'), true);
}
/**
diff --git a/actions/invite.php b/actions/invite.php
index 5dac048b0..4bba8893d 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -224,8 +224,10 @@ class InviteAction extends CurrentUserDesignAction
$headers['From'] = mail_notify_from();
$headers['To'] = trim($email);
+ // TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
$headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename);
+ // TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
$body = sprintf(_("%1\$s has invited you to join them on %2\$s (%3\$s).\n\n".
"%2\$s is a micro-blogging service that lets you keep up-to-date with people you know and people who interest you.\n\n".
"You can also share news about yourself, your thoughts, or your life online with people who know about you. ".
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 2fc7ef921..7307bc689 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -348,7 +348,7 @@ class RegisterAction extends Action
} else {
$instr =
common_markup_to_html(_('With this form you can create '.
- ' a new account. ' .
+ 'a new account. ' .
'You can then post notices and '.
'link up to friends and colleagues. '));
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 7be9618f8..9c5d83441 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -167,7 +167,7 @@ class ShownoticeAction extends OwnerDesignAction
function title()
{
if (!empty($this->profile->fullname)) {
- $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
+ $base = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
} else {
$base = $this->profile->nickname;
}
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 751495d57..6af1872a0 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -55,6 +55,7 @@ class SmssettingsAction extends ConnectSettingsAction
function title()
{
+ // TRANS: Title for SMS settings.
return _('SMS settings');
}
@@ -66,6 +67,10 @@ class SmssettingsAction extends ConnectSettingsAction
function getInstructions()
{
+ // XXX: For consistency of parameters in messages, this should be a
+ // regular parameters, replaced with sprintf().
+ // TRANS: SMS settings page instructions.
+ // TRANS: %%site.name%% is the name of the site.
return _('You can receive SMS messages through email from %%site.name%%.');
}
@@ -88,6 +93,7 @@ class SmssettingsAction extends ConnectSettingsAction
{
if (!common_config('sms', 'enabled')) {
$this->element('div', array('class' => 'error'),
+ // TRANS: Message given in the SMS settings if SMS is not enabled on the site.
_('SMS is not available.'));
return;
}
@@ -101,7 +107,8 @@ class SmssettingsAction extends ConnectSettingsAction
common_local_url('smssettings')));
$this->elementStart('fieldset', array('id' => 'settings_sms_address'));
- $this->element('legend', null, _('Address'));
+ // TRANS: Form legend for SMS settings form.
+ $this->element('legend', null, _('SMS address'));
$this->hidden('token', common_session_token());
if ($user->sms) {
@@ -109,10 +116,12 @@ class SmssettingsAction extends ConnectSettingsAction
$this->element('p', 'form_confirmed',
$user->sms . ' (' . $carrier->name . ')');
$this->element('p', 'form_guide',
+ // TRANS: Form guide in SMS settings form.
_('Current confirmed SMS-enabled phone number.'));
$this->hidden('sms', $user->sms);
$this->hidden('carrier', $user->carrier);
- $this->submit('remove', _('Remove'));
+ // TRANS: Button label to remove a confirmed SMS address.
+ $this->submit('remove', _m('BUTTON','Remove'));
} else {
$confirm = $this->getConfirmation();
if ($confirm) {
@@ -120,57 +129,75 @@ class SmssettingsAction extends ConnectSettingsAction
$this->element('p', 'form_unconfirmed',
$confirm->address . ' (' . $carrier->name . ')');
$this->element('p', 'form_guide',
+ // TRANS: Form guide in IM settings form.
_('Awaiting confirmation on this phone number.'));
$this->hidden('sms', $confirm->address);
$this->hidden('carrier', $confirm->address_extra);
- $this->submit('cancel', _('Cancel'));
+ // TRANS: Button label to cancel a SMS address confirmation procedure.
+ $this->submit('cancel', _m('BUTTON','Cancel'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label for SMS address input in SMS settings form.
$this->input('code', _('Confirmation code'), null,
+ // TRANS: Form field instructions in SMS settings form.
_('Enter the code you received on your phone.'));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('confirm', _('Confirm'));
+ // TRANS: Button label to confirm SMS confirmation code in SMS settings.
+ $this->submit('confirm', _m('BUTTON','Confirm'));
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Field label for SMS phone number input in SMS settings form.
$this->input('sms', _('SMS phone number'),
($this->arg('sms')) ? $this->arg('sms') : null,
+ // TRANS: SMS phone number input field instructions in SMS settings form.
_('Phone number, no punctuation or spaces, '.
'with area code'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->carrierSelect();
- $this->submit('add', _('Add'));
+ // TRANS: Button label for adding a SMS phone number in SMS settings form.
+ $this->submit('add', _m('BUTTON','Add'));
}
}
$this->elementEnd('fieldset');
if ($user->sms) {
$this->elementStart('fieldset', array('id' => 'settings_sms_incoming_email'));
+ // XXX: Confused! This is about SMS. Should this message be updated?
+ // TRANS: Form legend for incoming SMS settings form.
$this->element('legend', null, _('Incoming email'));
if ($user->incomingemail) {
$this->element('p', 'form_unconfirmed', $user->incomingemail);
$this->element('p', 'form_note',
+ // XXX: Confused! This is about SMS. Should this message be updated?
+ // TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
_('Send email to this address to post new notices.'));
- $this->submit('removeincoming', _('Remove'));
+ // TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+ $this->submit('removeincoming', _m('BUTTON','Remove'));
}
$this->element('p', 'form_guide',
+ // XXX: Confused! This is about SMS. Should this message be updated?
+ // TRANS: Instructions for incoming SMS e-mail address input form.
_('Make a new email address for posting to; '.
'cancels the old one.'));
- $this->submit('newincoming', _('New'));
+ // TRANS: Button label for adding an SMS e-mail address to send notices from.
+ $this->submit('newincoming', _m('BUTTON','New'));
$this->elementEnd('fieldset');
}
$this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
- $this->element('legend', null, _('Preferences'));
+ // TRANS: Form legend for SMS preferences form.
+ $this->element('legend', null, _('SMS preferences'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('smsnotify',
+ // TRANS: Checkbox label in SMS preferences form.
_('Send me notices through SMS; '.
'I understand I may incur '.
'exorbitant charges from my carrier.'),
@@ -178,7 +205,8 @@ class SmssettingsAction extends ConnectSettingsAction
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('save', _('Save'));
+ // TRANS: Button label to save SMS preferences.
+ $this->submit('save', _m('BUTTON','Save'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
@@ -245,6 +273,7 @@ class SmssettingsAction extends ConnectSettingsAction
} else if ($this->arg('confirm')) {
$this->confirmCode();
} else {
+ // TRANS: Message given submitting a form with an unknown action in SMS settings.
$this->showForm(_('Unexpected form submission.'));
}
}
@@ -275,13 +304,15 @@ class SmssettingsAction extends ConnectSettingsAction
if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error updating SMS preferences.
$this->serverError(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');
- $this->showForm(_('Preferences saved.'), true);
+ // TRANS: Confirmation message for successful SMS preferences save.
+ $this->showForm(_('SMS preferences saved.'), true);
}
/**
@@ -303,11 +334,13 @@ class SmssettingsAction extends ConnectSettingsAction
// Some validation
if (!$sms) {
+ // TRANS: Message given saving SMS phone number without having provided one.
$this->showForm(_('No phone number.'));
return;
}
if (!$carrier_id) {
+ // TRANS: Message given saving SMS phone number without having selected a carrier.
$this->showForm(_('No carrier selected.'));
return;
}
@@ -315,9 +348,11 @@ class SmssettingsAction extends ConnectSettingsAction
$sms = common_canonical_sms($sms);
if ($user->sms == $sms) {
+ // TRANS: Message given saving SMS phone number that is already set.
$this->showForm(_('That is already your phone number.'));
return;
} else if ($this->smsExists($sms)) {
+ // TRANS: Message given saving SMS phone number that is already set for another user.
$this->showForm(_('That phone number already belongs to another user.'));
return;
}
@@ -334,6 +369,7 @@ class SmssettingsAction extends ConnectSettingsAction
if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
+ // TRANS: Server error thrown on database error adding SMS confirmation code.
$this->serverError(_('Couldn\'t insert confirmation code.'));
return;
}
@@ -344,6 +380,7 @@ class SmssettingsAction extends ConnectSettingsAction
$user->nickname,
$carrier->toEmailAddress($sms));
+ // TRANS: Message given saving valid SMS phone number that is to be confirmed.
$msg = _('A confirmation code was sent to the phone number you added. '.
'Check your phone for the code and instructions '.
'on how to use it.');
@@ -367,10 +404,12 @@ class SmssettingsAction extends ConnectSettingsAction
$confirm = $this->getConfirmation();
if (!$confirm) {
+ // TRANS: Message given canceling SMS phone number confirmation that is not pending.
$this->showForm(_('No pending confirmation to cancel.'));
return;
}
if ($confirm->address != $sms) {
+ // TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
$this->showForm(_('That is the wrong confirmation number.'));
return;
}
@@ -379,11 +418,13 @@ class SmssettingsAction extends ConnectSettingsAction
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
+ // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
$this->serverError(_('Couldn\'t delete email confirmation.'));
return;
}
- $this->showForm(_('Confirmation cancelled.'), true);
+ // TRANS: Message given after successfully canceling SMS phone number confirmation.
+ $this->showForm(_('SMS confirmation cancelled.'), true);
}
/**
@@ -402,6 +443,8 @@ class SmssettingsAction extends ConnectSettingsAction
// Maybe an old tab open...?
if ($user->sms != $sms) {
+ // TRANS: Message given trying to remove an SMS phone number that is not
+ // TRANS: registered for the active user.
$this->showForm(_('That is not your phone number.'));
return;
}
@@ -417,12 +460,14 @@ class SmssettingsAction extends ConnectSettingsAction
$result = $user->updateKeys($original);
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
+ // TRANS: Server error thrown on database error removing a registered SMS phone number.
$this->serverError(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');
- $this->showForm(_('The address was removed.'), true);
+ // TRANS: Message given after successfully removing a registered SMS phone number.
+ $this->showForm(_('The SMS phone number was removed.'), true);
}
/**
@@ -462,10 +507,12 @@ class SmssettingsAction extends ConnectSettingsAction
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ // TRANS: Label for mobile carrier dropdown menu in SMS settings.
$this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
$this->elementStart('select', array('name' => 'carrier',
'id' => 'carrier'));
$this->element('option', array('value' => 0),
+ // TRANS: Default option for mobile carrier dropdown menu in SMS settings.
_('Select a carrier'));
while ($carrier->fetch()) {
$this->element('option', array('value' => $carrier->id),
@@ -473,6 +520,8 @@ class SmssettingsAction extends ConnectSettingsAction
}
$this->elementEnd('select');
$this->element('p', 'form_guide',
+ // TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+ // TRANS: %s is an administrative contact's e-mail address.
sprintf(_('Mobile carrier for your phone. '.
'If you know a carrier that accepts ' .
'SMS over email but isn\'t listed here, ' .
@@ -495,6 +544,7 @@ class SmssettingsAction extends ConnectSettingsAction
$code = $this->trimmed('code');
if (!$code) {
+ // TRANS: Message given saving SMS phone number confirmation code without having provided one.
$this->showForm(_('No code entered'));
return;
}
diff --git a/actions/snapshotadminpanel.php b/actions/snapshotadminpanel.php
index df6b168dc..be0a793e5 100644
--- a/actions/snapshotadminpanel.php
+++ b/actions/snapshotadminpanel.php
@@ -197,7 +197,7 @@ class SnapshotAdminPanelForm extends AdminForm
$this->out->elementStart('ul', 'form_data');
$this->li();
$snapshot = array(
- 'web' => _('Randomly during Web hit'),
+ 'web' => _('Randomly during web hit'),
'cron' => _('In a scheduled job'),
'never' => _('Never')
);
diff --git a/actions/tag.php b/actions/tag.php
index 953240404..7c6f99d92 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -102,12 +102,17 @@ class TagAction extends Action
function showContent()
{
- $nl = new NoticeList($this->notice, $this);
+ if(Event::handle('StartTagShowContent', array($this))) {
+
+ $nl = new NoticeList($this->notice, $this);
- $cnt = $nl->show();
+ $cnt = $nl->show();
- $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
- $this->page, 'tag', array('tag' => $this->tag));
+ $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+ $this->page, 'tag', array('tag' => $this->tag));
+
+ Event::handle('EndTagShowContent', array($this));
+ }
}
function isReadOnly($args)
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 29bda0a76..6606e76cd 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -59,8 +59,10 @@ class UsergroupsAction extends OwnerDesignAction
function title()
{
if ($this->page == 1) {
+ // TRANS: Message is used as a page title. %s is a nick name.
return sprintf(_('%s groups'), $this->user->nickname);
} else {
+ // TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
return sprintf(_('%1$s groups, page %2$d'),
$this->user->nickname,
$this->page);
diff --git a/actions/userrss.php b/actions/userrss.php
index cf7d18ca8..b7078fcaf 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -72,7 +72,7 @@ class UserrssAction extends Rss10Action
{
$notice = $this->user->getNotices(
0,
- ($limit == 0) ? NOTICES_PER_PAGE : $limit
+ ($this->limit == 0) ? NOTICES_PER_PAGE : $this->limit
);
$notices = array();
@@ -90,8 +90,10 @@ class UserrssAction extends Rss10Action
$c = array('url' => common_local_url('userrss',
array('nickname' =>
$user->nickname)),
+ // TRANS: Message is used as link title. %s is a user nickname.
'title' => sprintf(_('%s timeline'), $user->nickname),
'link' => $profile->profileurl,
+ // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
'description' => sprintf(_('Updates from %1$s on %2$s!'),
$user->nickname, common_config('site', 'name')));
return $c;
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/classes/File.php b/classes/File.php
index 8297e5091..0cd31075d 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -302,7 +302,9 @@ class File extends Memcached_DataObject
if(! isset($this->filename)){
$notEnclosureMimeTypes = array(null,'text/html','application/xhtml+xml');
- $mimetype = strtolower($this->mimetype);
+ if($mimetype != null){
+ $mimetype = strtolower($this->mimetype);
+ }
$semicolon = strpos($mimetype,';');
if($semicolon){
$mimetype = substr($mimetype,0,$semicolon);
diff --git a/classes/Notice.php b/classes/Notice.php
index cda632885..cf6f9c279 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/
*/
@@ -177,7 +178,8 @@ class Notice extends Memcached_DataObject
$id = $tag->insert();
if (!$id) {
- throw new ServerException(sprintf(_('DB error inserting hashtag: %s'),
+ // TRANS: Server exception. %s are the error details.
+ throw new ServerException(sprintf(_('Database error inserting hashtag: %s'),
$last_error->message));
return;
}
@@ -1555,6 +1557,8 @@ class Notice extends Memcached_DataObject
{
$author = Profile::staticGet('id', $this->profile_id);
+ // 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.
$content = sprintf(_('RT @%1$s %2$s'),
$author->nickname,
$this->content);
diff --git a/classes/Safe_DataObject.php b/classes/Safe_DataObject.php
index 08bc6846f..e926cb0d5 100644
--- a/classes/Safe_DataObject.php
+++ b/classes/Safe_DataObject.php
@@ -96,6 +96,30 @@ class Safe_DataObject extends DB_DataObject
$this->_link_loaded = false;
}
+ /**
+ * Magic function called when someone attempts to call a method
+ * that doesn't exist. DB_DataObject uses this to implement
+ * setters and getters for fields, but neglects to throw an error
+ * when you just misspell an actual method name. This leads to
+ * silent failures which can cause all kinds of havoc.
+ *
+ * @param string $method
+ * @param array $params
+ * @return mixed
+ * @throws Exception
+ */
+ function __call($method, $params)
+ {
+ $return = null;
+ // Yes, that's _call with one underscore, which does the
+ // actual implementation.
+ if ($this->_call($method, $params, $return)) {
+ return $return;
+ } else {
+ throw new Exception('Call to undefined method ' .
+ get_class($this) . '::' . $method);
+ }
+ }
/**
* Work around memory-leak bugs...
diff --git a/classes/Subscription.php b/classes/Subscription.php
index 60c12cccc..0679c0925 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -88,8 +88,8 @@ class Subscription extends Memcached_DataObject
self::blow('user:notices_with_friends:%d', $subscriber->id);
- $subscriber->blowSubscriptionsCount();
- $other->blowSubscribersCount();
+ $subscriber->blowSubscriptionCount();
+ $other->blowSubscriberCount();
$otherUser = User::staticGet('id', $other->id);
@@ -213,8 +213,8 @@ class Subscription extends Memcached_DataObject
self::blow('user:notices_with_friends:%d', $subscriber->id);
- $subscriber->blowSubscriptionsCount();
- $other->blowSubscribersCount();
+ $subscriber->blowSubscriptionCount();
+ $other->blowSubscriberCount();
Event::handle('EndUnsubscribe', array($subscriber, $other));
}
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/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/index.php b/index.php
index 3778ffe42..d68a057c4 100644
--- a/index.php
+++ b/index.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/
*/
@@ -185,7 +186,7 @@ function checkMirror($action_obj, $args)
function isLoginAction($action)
{
- static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'rsd');
+ 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/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index c79a1f5d7..57740f8b8 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -105,27 +105,45 @@ class AccountSettingsNav extends Widget
$user = common_current_user();
if(Event::handle('StartAccountSettingsProfileMenuItem', array($this, &$menu))){
- $this->showMenuItem('profilesettings',_('Profile'),_('Change your profile settings'));
+ // TRANS: Link title attribute in user account settings menu.
+ $title = _('Change your profile settings');
+ // TRANS: Link description in user account settings menu.
+ $this->showMenuItem('profilesettings',_('Profile'),$title);
Event::handle('EndAccountSettingsProfileMenuItem', array($this, &$menu));
}
if(Event::handle('StartAccountSettingsAvatarMenuItem', array($this, &$menu))){
- $this->showMenuItem('avatarsettings',_('Avatar'),_('Upload an avatar'));
+ // TRANS: Link title attribute in user account settings menu.
+ $title = _('Upload an avatar');
+ // TRANS: Link description in user account settings menu.
+ $this->showMenuItem('avatarsettings',_('Avatar'),$title);
Event::handle('EndAccountSettingsAvatarMenuItem', array($this, &$menu));
}
if(Event::handle('StartAccountSettingsPasswordMenuItem', array($this, &$menu))){
- $this->showMenuItem('passwordsettings',_('Password'),_('Change your password'));
+ // TRANS: Link title attribute in user account settings menu.
+ $title = _('Change your password');
+ // TRANS: Link description in user account settings menu.
+ $this->showMenuItem('passwordsettings',_('Password'),$title);
Event::handle('EndAccountSettingsPasswordMenuItem', array($this, &$menu));
}
if(Event::handle('StartAccountSettingsEmailMenuItem', array($this, &$menu))){
- $this->showMenuItem('emailsettings',_('Email'),_('Change email handling'));
+ // TRANS: Link title attribute in user account settings menu.
+ $title = _('Change email handling');
+ // TRANS: Link description in user account settings menu.
+ $this->showMenuItem('emailsettings',_('Email'),$title);
Event::handle('EndAccountSettingsEmailMenuItem', array($this, &$menu));
}
if(Event::handle('StartAccountSettingsDesignMenuItem', array($this, &$menu))){
- $this->showMenuItem('userdesignsettings',_('Design'),_('Design your profile'));
+ // TRANS: Link title attribute in user account settings menu.
+ $title = _('Design your profile');
+ // TRANS: Link description in user account settings menu.
+ $this->showMenuItem('userdesignsettings',_('Design'),$title);
Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
}
if(Event::handle('StartAccountSettingsOtherMenuItem', array($this, &$menu))){
- $this->showMenuItem('othersettings',_('Other'),_('Other options'));
+ // TRANS: Link title attribute in user account settings menu.
+ $title = _('Other options');
+ // TRANS: Link description in user account settings menu.
+ $this->showMenuItem('othersettings',_('Other'),$title);
Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
}
diff --git a/lib/action.php b/lib/action.php
index c4d9fd5cb..98e5ec2c9 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -141,6 +141,7 @@ class Action extends HTMLOutputter // lawsuit
function showTitle()
{
$this->element('title', null,
+ // TRANS: Page title. %1$s is the title, %2$s is the site name.
sprintf(_("%1\$s - %2\$s"),
$this->title(),
common_config('site', 'name')));
@@ -156,6 +157,7 @@ class Action extends HTMLOutputter // lawsuit
function title()
{
+ // TRANS: Page title for a page without a title set.
return _("Untitled page");
}
@@ -420,6 +422,7 @@ class Action extends HTMLOutputter // lawsuit
{
$user = common_current_user();
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
+ // TRANS: DT element for primary navigation menu. String is hidden in default CSS.
$this->element('dt', null, _('Primary site navigation'));
$this->elementStart('dd');
$this->elementStart('ul', array('class' => 'nav'));
@@ -427,31 +430,31 @@ class Action extends HTMLOutputter // lawsuit
if ($user) {
// TRANS: Tooltip for main menu option "Personal"
$tooltip = _m('TOOLTIP', 'Personal profile and friends timeline');
- // TRANS: Main menu option when logged in for access to personal profile and friends timeline
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
+ // TRANS: Main menu option when logged in for access to personal profile and friends timeline
_m('MENU', 'Personal'), $tooltip, false, 'nav_home');
// TRANS: Tooltip for main menu option "Account"
$tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile');
- // TRANS: Main menu option when logged in for access to user settings
$this->menuItem(common_local_url('profilesettings'),
+ // TRANS: Main menu option when logged in for access to user settings
_('Account'), $tooltip, false, 'nav_account');
// TRANS: Tooltip for main menu option "Services"
$tooltip = _m('TOOLTIP', 'Connect to services');
- // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
$this->menuItem(common_local_url('oauthconnectionssettings'),
+ // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
_('Connect'), $tooltip, false, 'nav_connect');
if ($user->hasRight(Right::CONFIGURESITE)) {
// TRANS: Tooltip for menu option "Admin"
$tooltip = _m('TOOLTIP', 'Change site configuration');
- // TRANS: Main menu option when logged in and site admin for access to site configuration
$this->menuItem(common_local_url('siteadminpanel'),
+ // TRANS: Main menu option when logged in and site admin for access to site configuration
_m('MENU', 'Admin'), $tooltip, false, 'nav_admin');
}
if (common_config('invite', 'enabled')) {
// TRANS: Tooltip for main menu option "Invite"
$tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s');
- // TRANS: Main menu option when logged in and invitations are allowed for inviting new users
$this->menuItem(common_local_url('invite'),
+ // TRANS: Main menu option when logged in and invitations are allowed for inviting new users
_m('MENU', 'Invite'),
sprintf($tooltip,
common_config('site', 'name')),
@@ -459,16 +462,16 @@ class Action extends HTMLOutputter // lawsuit
}
// TRANS: Tooltip for main menu option "Logout"
$tooltip = _m('TOOLTIP', 'Logout from the site');
- // TRANS: Main menu option when logged in to log out the current user
$this->menuItem(common_local_url('logout'),
+ // TRANS: Main menu option when logged in to log out the current user
_m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
}
else {
if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
// TRANS: Tooltip for main menu option "Register"
$tooltip = _m('TOOLTIP', 'Create an account');
- // TRANS: Main menu option when not logged in to register a new account
$this->menuItem(common_local_url('register'),
+ // TRANS: Main menu option when not logged in to register a new account
_m('MENU', 'Register'), $tooltip, false, 'nav_register');
}
// TRANS: Tooltip for main menu option "Login"
@@ -575,6 +578,7 @@ class Action extends HTMLOutputter // lawsuit
function showLocalNavBlock()
{
$this->elementStart('dl', array('id' => 'site_nav_local_views'));
+ // TRANS: DT element for local views block. String is hidden in default CSS.
$this->element('dt', null, _('Local views'));
$this->elementStart('dd');
$this->showLocalNav();
@@ -641,6 +645,7 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dl', array('id' => 'page_notice',
'class' => 'system_notice'));
+ // TRANS: DT element for page notice. String is hidden in default CSS.
$this->element('dt', null, _('Page notice'));
$this->elementStart('dd');
if (Event::handle('StartShowPageNotice', array($this))) {
@@ -743,28 +748,37 @@ class Action extends HTMLOutputter // lawsuit
function showSecondaryNav()
{
$this->elementStart('dl', array('id' => 'site_nav_global_secondary'));
+ // TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
$this->element('dt', null, _('Secondary site navigation'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
if (Event::handle('StartSecondaryNav', array($this))) {
$this->menuItem(common_local_url('doc', array('title' => 'help')),
+ // TRANS: Secondary navigation menu option leading to help on StatusNet.
_('Help'));
$this->menuItem(common_local_url('doc', array('title' => 'about')),
+ // TRANS: Secondary navigation menu option leading to text about StatusNet site.
_('About'));
$this->menuItem(common_local_url('doc', array('title' => 'faq')),
+ // TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
_('FAQ'));
$bb = common_config('site', 'broughtby');
if (!empty($bb)) {
$this->menuItem(common_local_url('doc', array('title' => 'tos')),
+ // TRANS: Secondary navigation menu option leading to Terms of Service.
_('TOS'));
}
$this->menuItem(common_local_url('doc', array('title' => 'privacy')),
+ // TRANS: Secondary navigation menu option leading to privacy policy.
_('Privacy'));
$this->menuItem(common_local_url('doc', array('title' => 'source')),
+ // TRANS: Secondary navigation menu option.
_('Source'));
$this->menuItem(common_local_url('version'),
+ // TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
_('Version'));
$this->menuItem(common_local_url('doc', array('title' => 'contact')),
+ // TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
_('Contact'));
$this->menuItem(common_local_url('doc', array('title' => 'badge')),
_('Badge'));
@@ -795,16 +809,18 @@ class Action extends HTMLOutputter // lawsuit
*/
function showStatusNetLicense()
{
+ // TRANS: DT element for StatusNet software license.
$this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license'));
$this->elementStart('dd', null);
- // @fixme drop the final spaces in the messages when at good spot
- // to let translations get updated.
if (common_config('site', 'broughtby')) {
- $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+ // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+ $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%).');
} else {
- $instr = _('**%%site.name%%** is a microblogging service. ');
+ // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+ $instr = _('**%%site.name%%** is a microblogging service.');
}
$instr .= ' ';
+ // TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
$instr .= sprintf(_('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).'), STATUSNET_VERSION);
$output = common_markup_to_html($instr);
$this->raw($output);
@@ -820,19 +836,25 @@ class Action extends HTMLOutputter // lawsuit
function showContentLicense()
{
if (Event::handle('StartShowContentLicense', array($this))) {
+ // TRANS: DT element for StatusNet site content license.
$this->element('dt', array('id' => 'site_content_license'), _('Site content license'));
$this->elementStart('dd', array('id' => 'site_content_license_cc'));
switch (common_config('license', 'type')) {
case 'private':
+ // TRANS: Content license displayed when license is set to 'private'.
+ // TRANS: %1$s is the site name.
$this->element('p', null, sprintf(_('Content and data of %1$s are private and confidential.'),
common_config('site', 'name')));
// fall through
case 'allrightsreserved':
if (common_config('license', 'owner')) {
+ // TRANS: Content license displayed when license is set to 'allrightsreserved'.
+ // TRANS: %1$s is the copyright owner.
$this->element('p', null, sprintf(_('Content and data copyright by %1$s. All rights reserved.'),
common_config('license', 'owner')));
} else {
+ // TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
$this->element('p', null, _('Content and data copyright by contributors. All rights reserved.'));
}
break;
@@ -1148,11 +1170,15 @@ class Action extends HTMLOutputter // lawsuit
*
* @return nothing
*/
+ // XXX: The messages in this pagination method only tailor to navigating
+ // notices. In other lists, "Previous"/"Next" type navigation is
+ // desirable, but not available.
function pagination($have_before, $have_after, $page, $action, $args=null)
{
// Does a little before-after block for next/prev page
if ($have_before || $have_after) {
$this->elementStart('dl', 'pagination');
+ // TRANS: DT element for pagination (previous/next, etc.).
$this->element('dt', null, _('Pagination'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
@@ -1162,6 +1188,8 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('li', array('class' => 'nav_prev'));
$this->element('a', array('href' => common_local_url($action, $args, $pargs),
'rel' => 'prev'),
+ // TRANS: Pagination message to go to a page displaying information more in the
+ // TRANS: present than the currently displayed information.
_('After'));
$this->elementEnd('li');
}
@@ -1170,6 +1198,8 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('li', array('class' => 'nav_next'));
$this->element('a', array('href' => common_local_url($action, $args, $pargs),
'rel' => 'next'),
+ // TRANS: Pagination message to go to a page displaying information more in the
+ // TRANS: past than the currently displayed information.
_('Before'));
$this->elementEnd('li');
}
@@ -1213,6 +1243,8 @@ class Action extends HTMLOutputter // lawsuit
* @return void
*/
+ // XXX: Finding this type of check with the same message about 50 times.
+ // Possible to refactor?
function checkSessionToken()
{
// CSRF protection
diff --git a/lib/activity.php b/lib/activity.php
index 27f09ab4d..8e2da99bb 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -118,7 +118,8 @@ class Activity
// Insist on a feed's root DOMElement; don't allow a DOMDocument
if ($feed instanceof DOMDocument) {
throw new ClientException(
- _("Expecting a root feed element but got a whole XML document.")
+ // TRANS: Client exception thrown when a feed instance is a DOMDocument.
+ _('Expecting a root feed element but got a whole XML document.')
);
}
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index a927e2333..e22804fc8 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -69,7 +69,7 @@ class AdminPanelAction extends Action
// User must be logged in.
if (!common_logged_in()) {
- // TRANS: Client error message
+ // TRANS: Client error message thrown when trying to access the admin panel while not logged in.
$this->clientError(_('Not logged in.'));
return false;
}
@@ -94,7 +94,7 @@ class AdminPanelAction extends Action
// User must have the right to change admin settings
if (!$user->hasRight(Right::CONFIGURESITE)) {
- // TRANS: Client error message
+ // TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
$this->clientError(_('You cannot make changes to this site.'));
return false;
}
@@ -106,7 +106,7 @@ class AdminPanelAction extends Action
$name = mb_substr($name, 0, -10);
if (!self::canAdmin($name)) {
- // TRANS: Client error message
+ // TRANS: Client error message throw when a certain panel's settings cannot be changed.
$this->clientError(_('Changes to that panel are not allowed.'), 403);
return false;
}
@@ -225,7 +225,7 @@ class AdminPanelAction extends Action
function showForm()
{
- // TRANS: Client error message
+ // TRANS: Client error message.
$this->clientError(_('showForm() not implemented.'));
return;
}
@@ -279,7 +279,8 @@ class AdminPanelAction extends Action
$result = $config->delete();
if (!$result) {
common_log_db_error($config, 'DELETE', __FILE__);
- // TRANS: Client error message
+ // TRANS: Client error message thrown if design settings could not be deleted in
+ // TRANS: the admin panel Design.
$this->clientError(_("Unable to delete design setting."));
return null;
}
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 68198effc..7085c096b 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -28,10 +28,72 @@
* @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);
}
@@ -111,6 +173,7 @@ class ApiAction extends Action
function handle($args)
{
+ header('Access-Control-Allow-Origin: *');
parent::handle($args);
}
@@ -1090,6 +1153,7 @@ class ApiAction extends Action
$this->initTwitterAtom();
break;
default:
+ // TRANS: Client error on an API request with an unsupported data format.
$this->clientError(_('Not a supported data format.'));
break;
}
@@ -1118,6 +1182,7 @@ class ApiAction extends Action
$this->endTwitterRss();
break;
default:
+ // TRANS: Client error on an API request with an unsupported data format.
$this->clientError(_('Not a supported data format.'));
break;
}
@@ -1234,6 +1299,7 @@ class ApiAction extends Action
$this->showJsonObjects($profile_array);
break;
default:
+ // TRANS: Client error on an API request with an unsupported data format.
$this->clientError(_('Not a supported data format.'));
return;
}
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 95acbbd7b..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);
}
@@ -90,6 +109,7 @@ class ApiAuthAction extends ApiAction
if ($this->isReadOnly($args) == false) {
if ($this->access != self::READ_WRITE) {
+ // TRANS: Client error 401.
$msg = _('API resource requires read-write access, ' .
'but you only have read access.');
$this->clientError($msg, 401, $this->format);
@@ -272,8 +292,8 @@ class ApiAuthAction extends ApiAction
list($proxy, $ip) = common_client_ip();
- $msg = sprintf(_('Failed API auth attempt, nickname = %1$s, ' .
- 'proxy = %2$s, ip = %3$s'),
+ $msg = sprintf( 'Failed API auth attempt, nickname = %1$s, ' .
+ 'proxy = %2$s, ip = %3$s',
$this->auth_user_nickname,
$proxy,
$ip);
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/applicationeditform.php b/lib/applicationeditform.php
index 9b7d05861..81c8fb018 100644
--- a/lib/applicationeditform.php
+++ b/lib/applicationeditform.php
@@ -133,6 +133,7 @@ class ApplicationEditForm extends Form
function formLegend()
{
+ // TRANS: Form legend.
$this->out->element('legend', null, _('Edit application'));
}
@@ -177,10 +178,12 @@ class ApplicationEditForm extends Form
}
$this->out->element('label', array('for' => 'app_icon'),
+ // TRANS: Form input field label for application icon.
_('Icon'));
$this->out->element('input', array('name' => 'app_icon',
'type' => 'file',
'id' => 'app_icon'));
+ // TRANS: Form guide.
$this->out->element('p', 'form_guide', _('Icon for this application'));
$this->out->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
@@ -192,6 +195,7 @@ class ApplicationEditForm extends Form
$this->out->hidden('application_id', $id);
+ // TRANS: Form input field label for application name.
$this->out->input('name', _('Name'),
($this->out->arg('name')) ? $this->out->arg('name') : $name);
@@ -201,11 +205,14 @@ class ApplicationEditForm extends Form
$maxDesc = Oauth_application::maxDesc();
if ($maxDesc > 0) {
+ // TRANS: Form input field instructions.
$descInstr = sprintf(_('Describe your application in %d characters'),
$maxDesc);
} else {
+ // TRANS: Form input field instructions.
$descInstr = _('Describe your application');
}
+ // TRANS: Form input field label.
$this->out->textarea('description', _('Description'),
($this->out->arg('description')) ? $this->out->arg('description') : $description,
$descInstr);
@@ -213,27 +220,39 @@ class ApplicationEditForm extends Form
$this->out->elementEnd('li');
$this->out->elementStart('li');
+ // TRANS: Form input field instructions.
+ $instruction = _('URL of the homepage of this application');
+ // TRANS: Form input field label.
$this->out->input('source_url', _('Source URL'),
($this->out->arg('source_url')) ? $this->out->arg('source_url') : $source_url,
- _('URL of the homepage of this application'));
+ $instruction);
$this->out->elementEnd('li');
$this->out->elementStart('li');
+ // TRANS: Form input field instructions.
+ $instruction = _('Organization responsible for this application');
+ // TRANS: Form input field label.
$this->out->input('organization', _('Organization'),
($this->out->arg('organization')) ? $this->out->arg('organization') : $organization,
- _('Organization responsible for this application'));
+ $instruction);
$this->out->elementEnd('li');
$this->out->elementStart('li');
+ // TRANS: Form input field instructions.
+ $instruction = _('URL for the homepage of the organization');
+ // TRANS: Form input field label.
$this->out->input('homepage', _('Homepage'),
($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
- _('URL for the homepage of the organization'));
+ $instruction);
$this->out->elementEnd('li');
$this->out->elementStart('li');
+ // TRANS: Form input field instructions.
+ $instruction = _('URL to redirect to after authentication');
+ // TRANS: Form input field label.
$this->out->input('callback_url', ('Callback URL'),
($this->out->arg('callback_url')) ? $this->out->arg('callback_url') : $callback_url,
- _('URL to redirect to after authentication'));
+ $instruction);
$this->out->elementEnd('li');
$this->out->elementStart('li', array('id' => 'application_types'));
@@ -255,6 +274,7 @@ class ApplicationEditForm extends Form
$this->out->element('label', array('for' => 'app_type-browser',
'class' => 'radio'),
+ // TRANS: Radio button label for application type
_('Browser'));
$attrs = array('name' => 'app_type',
@@ -271,7 +291,9 @@ class ApplicationEditForm extends Form
$this->out->element('label', array('for' => 'app_type-desktop',
'class' => 'radio'),
+ // TRANS: Radio button label for application type
_('Desktop'));
+ // TRANS: Form guide.
$this->out->element('p', 'form_guide', _('Type of application, browser or desktop'));
$this->out->elementEnd('li');
@@ -294,6 +316,7 @@ class ApplicationEditForm extends Form
$this->out->element('label', array('for' => 'default_access_type-ro',
'class' => 'radio'),
+ // TRANS: Radio button label for access type.
_('Read-only'));
$attrs = array('name' => 'default_access_type',
@@ -312,7 +335,9 @@ class ApplicationEditForm extends Form
$this->out->element('label', array('for' => 'default_access_type-rw',
'class' => 'radio'),
+ // TRANS: Radio button label for access type.
_('Read-write'));
+ // TRANS: Form guide.
$this->out->element('p', 'form_guide', _('Default access for this application: read-only, or read-write'));
$this->out->elementEnd('li');
@@ -328,9 +353,13 @@ class ApplicationEditForm extends Form
function formActions()
{
- $this->out->submit('cancel', _('Cancel'), 'submit form_action-primary',
+ // TRANS: Button label
+ $this->out->submit('cancel', _m('BUTTON','Cancel'), 'submit form_action-primary',
+ // TRANS: Submit button title
'cancel', _('Cancel'));
- $this->out->submit('save', _('Save'), 'submit form_action-secondary',
+ // TRANS: Button label
+ $this->out->submit('save', _m('BUTTON','Save'), 'submit form_action-secondary',
+ // TRANS: Submit button title
'save', _('Save'));
}
}
diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index 3abb1f8aa..904f8981d 100644
--- a/lib/applicationlist.php
+++ b/lib/applicationlist.php
@@ -88,7 +88,6 @@ class ApplicationList extends Widget
function showApplication()
{
-
$user = common_current_user();
$this->out->elementStart('li', array('class' => 'application',
@@ -133,11 +132,16 @@ class ApplicationList extends Widget
$this->out->elementStart('li');
- $access = ($this->application->access_type & Oauth_application::$writeAccess)
- ? 'read-write' : 'read-only';
+ // TRANS: Application access type
+ $readWriteText = _('read-write');
+ // TRANS: Application access type
+ $readOnlyText = _('read-only');
- $txt = 'Approved ' . common_date_string($appUser->modified) .
- " - $access access.";
+ $access = ($this->application->access_type & Oauth_application::$writeAccess)
+ ? $readWriteText : $readOnlyText;
+ $modifiedDate = common_date_string($appUser->modified);
+ // TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+ $txt = sprintf(_('Approved %1$s - "%2$s" access.'),$modifiedDate,$access);
$this->out->raw($txt);
$this->out->elementEnd('li');
@@ -151,7 +155,8 @@ class ApplicationList extends Widget
$this->out->elementStart('fieldset');
$this->out->hidden('id', $this->application->id);
$this->out->hidden('token', common_session_token());
- $this->out->submit('revoke', _('Revoke'));
+ // TRANS: Button label
+ $this->out->submit('revoke', _m('BUTTON','Revoke'));
$this->out->elementEnd('fieldset');
$this->out->elementEnd('form');
$this->out->elementEnd('li');
diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 7934a4f9e..c7c36af82 100644
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -59,11 +59,14 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
parent::__construct($cur, $indent);
$this->group = $group;
+ // TRANS: Title in atom group notice feed. %s is a group name.
$title = sprintf(_("%s timeline"), $group->nickname);
$this->setTitle($title);
$sitename = common_config('site', 'name');
$subtitle = sprintf(
+ // 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.
_('Updates from %1$s on %2$s!'),
$group->nickname,
$sitename
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index b569d9379..785db4915 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -65,11 +65,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
$this->setActivitySubject($profile->asActivityNoun('subject'));
}
+ // TRANS: Title in atom user notice feed. %s is a user name.
$title = sprintf(_("%s timeline"), $user->nickname);
$this->setTitle($title);
$sitename = common_config('site', 'name');
$subtitle = sprintf(
+ // 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.
_('Updates from %1$s on %2$s!'),
$user->nickname, $sitename
);
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 43f836e15..59cab9532 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -84,6 +84,7 @@ class AttachmentList extends Widget
if (empty($att)) return 0;
$this->out->elementStart('dl', array('id' =>'attachments',
'class' => 'entry-content'));
+ // TRANS: DT element label in attachment list.
$this->out->element('dt', null, _('Attachments'));
$this->out->elementStart('dd');
$this->out->elementStart('ol', array('class' => 'attachments'));
@@ -260,6 +261,7 @@ class Attachment extends AttachmentListItem
'class' => 'entry-content'));
if (!empty($this->oembed->author_name)) {
$this->out->elementStart('dl', 'vcard author');
+ // TRANS: DT element label in attachment list item.
$this->out->element('dt', null, _('Author'));
$this->out->elementStart('dd', 'fn');
if (empty($this->oembed->author_url)) {
@@ -273,6 +275,7 @@ class Attachment extends AttachmentListItem
}
if (!empty($this->oembed->provider)) {
$this->out->elementStart('dl', 'vcard');
+ // TRANS: DT element label in attachment list item.
$this->out->element('dt', null, _('Provider'));
$this->out->elementStart('dd', 'fn');
if (empty($this->oembed->provider_url)) {
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 07da9b2d1..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/
*/
@@ -67,7 +68,7 @@ abstract class AuthorizationPlugin extends Plugin
//------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\
- function onStartSetUser(&$user) {
+ function onStartSetUser($user) {
$loginAllowed = $this->loginAllowed($user);
if($loginAllowed === true){
return;
@@ -84,7 +85,7 @@ abstract class AuthorizationPlugin extends Plugin
}
}
- function onStartSetApiUser(&$user) {
+ function onStartSetApiUser($user) {
return $this->onStartSetUser($user);
}
diff --git a/lib/command.php b/lib/command.php
index 216f9e649..a769dc1fc 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -122,6 +122,8 @@ class Command
}
Event::handle('EndCommandGetProfile', array($this, $arg, &$profile));
if (!$profile) {
+ // 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.
throw new CommandException(sprintf(_('Could not find a user with nickname %s'), $arg));
}
return $profile;
@@ -140,6 +142,8 @@ class Command
}
Event::handle('EndCommandGetUser', array($this, $arg, &$user));
if (!$user){
+ // TRANS: Message given getting a non-existing user.
+ // TRANS: %s is the nickname of the user that could not be found.
throw new CommandException(sprintf(_('Could not find a local user with nickname %s'),
$arg));
}
@@ -225,6 +229,8 @@ class NudgeCommand extends Command
}
// XXX: notify by IM
// XXX: notify by SMS
+ // TRANS: Message given having nudged another user.
+ // TRANS: %s is the nickname of the user that was nudged.
$channel->output($this->user, sprintf(_('Nudge sent to %s'),
$recipient->nickname));
}
@@ -328,12 +334,16 @@ class JoinCommand extends Command
Event::handle('EndJoinGroup', array($group, $cur));
}
} catch (Exception $e) {
- $channel->error($cur, sprintf(_('Could not join user %s to group %s'),
+ // 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.
+ $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s'),
$cur->nickname, $group->nickname));
return;
}
- $channel->output($cur, sprintf(_('%s joined group %s'),
+ // 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.
+ $channel->output($cur, sprintf(_('%1$s joined group %2$s'),
$cur->nickname,
$group->nickname));
}
@@ -370,12 +380,16 @@ class DropCommand extends Command
Event::handle('EndLeaveGroup', array($group, $cur));
}
} catch (Exception $e) {
- $channel->error($cur, sprintf(_('Could not remove user %s to group %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.
+ $channel->error($cur, sprintf(_('Could not remove user %1$s from group %2$s'),
$cur->nickname, $group->nickname));
return;
}
- $channel->output($cur, sprintf(_('%s left group %s'),
+ // 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.
+ $channel->output($cur, sprintf(_('%1$s left group %2$s'),
$cur->nickname,
$group->nickname));
}
@@ -395,18 +409,24 @@ class WhoisCommand extends Command
{
$recipient = $this->getProfile($this->other);
+ // TRANS: Whois output.
+ // TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
$whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
$recipient->profileurl);
if ($recipient->fullname) {
+ // TRANS: Whois output. %s is the full name of the queried user.
$whois .= "\n" . sprintf(_('Fullname: %s'), $recipient->fullname);
}
if ($recipient->location) {
+ // TRANS: Whois output. %s is the location of the queried user.
$whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);
}
if ($recipient->homepage) {
+ // TRANS: Whois output. %s is the homepage of the queried user.
$whois .= "\n" . sprintf(_('Homepage: %s'), $recipient->homepage);
}
if ($recipient->bio) {
+ // TRANS: Whois output. %s is the bio information of the queried user.
$whois .= "\n" . sprintf(_('About: %s'), $recipient->bio);
}
$channel->output($this->user, $whois);
@@ -447,7 +467,9 @@ class MessageCommand extends Command
$this->text = common_shorten_links($this->text);
if (Message::contentTooLong($this->text)) {
- $channel->error($this->user, sprintf(_('Message too long - maximum is %d characters, you sent %d'),
+ // 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.
+ $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d'),
Message::maxContent(), mb_strlen($this->text)));
return;
}
@@ -465,6 +487,8 @@ class MessageCommand extends Command
$message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
if ($message) {
$message->notify();
+ // TRANS: Message given have sent a direct message to another user.
+ // TRANS: %s is the name of the other user.
$channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other));
} else {
$channel->error($this->user, _('Error sending direct message.'));
@@ -500,6 +524,8 @@ class RepeatCommand extends Command
if ($repeat) {
+ // TRANS: Message given having repeated a notice from another user.
+ // TRANS: %s is the name of the user for which the notice was repeated.
$channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname));
} else {
$channel->error($this->user, _('Error repeating notice.'));
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 7786b5941..5dc2b38da 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -100,6 +100,7 @@ class HTMLOutputter extends XMLOutputter
$type = common_negotiate_type($cp, $sp);
if (!$type) {
+ // TRANS: Client exception 406
throw new ClientException(_('This page is not available in a '.
'media type you accept'), 406);
}
diff --git a/lib/installer.php b/lib/installer.php
index 58ffbfef7..1cad2fd20 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
diff --git a/lib/language.php b/lib/language.php
index cb12cca69..1805707ad 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -206,6 +206,7 @@ function _mdomain($backtrace)
static $cached;
$path = $backtrace[0]['file'];
if (!isset($cached[$path])) {
+ $final = 'statusnet'; // assume default domain
if (DIRECTORY_SEPARATOR !== '/') {
$path = strtr($path, DIRECTORY_SEPARATOR, '/');
}
@@ -224,6 +225,7 @@ function _mdomain($backtrace)
return 'statusnet';
}
}
+ $cached[$path] = $final;
}
return $cached[$path];
}
@@ -298,6 +300,7 @@ function get_nice_language_list()
*/
function get_all_languages() {
return array(
+ 'af' => array('q' => 0.8, 'lang' => 'af', 'name' => 'Afrikaans', 'direction' => 'ltr'),
'ar' => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'),
'arz' => array('q' => 0.8, 'lang' => 'arz', 'name' => 'Egyptian Spoken Arabic', 'direction' => 'rtl'),
'bg' => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
@@ -313,7 +316,8 @@ function get_all_languages() {
'fi' => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
'fa' => array('q' => 1, 'lang' => 'fa', 'name' => 'Persian', 'direction' => 'rtl'),
'fr-fr' => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
- 'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
+ 'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Irish', 'direction' => 'ltr'),
+ 'gl' => array('q' => 0.8, 'lang' => 'gl', 'name' => 'Galician', 'direction' => 'ltr'),
'he' => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
'hsb' => array('q' => 0.8, 'lang' => 'hsb', 'name' => 'Upper Sorbian', 'direction' => 'ltr'),
'ia' => array('q' => 0.8, 'lang' => 'ia', 'name' => 'Interlingua', 'direction' => 'ltr'),
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 10d90d008..1c96c42d7 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -171,7 +171,7 @@ class MediaFile
return;
}
- if (!MediaFile::respectsQuota($user, $_FILES['attach']['size'])) {
+ if (!MediaFile::respectsQuota($user, $_FILES[$param]['size'])) {
// Should never actually get here
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 7278c41a9..84c20a5b3 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -212,8 +212,8 @@ class NoticeForm extends Form
$this->out->checkbox('notice_data-geo', _('Share my location'), true);
$this->out->elementEnd('div');
$this->out->inlineScript(' var NoticeDataGeo_text = {'.
- 'ShareDisable: "'._('Do not share my location').'",'.
- 'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'.
+ 'ShareDisable: ' .json_encode(_('Do not share my location')).','.
+ 'ErrorTimeout: ' .json_encode(_('Sorry, retrieving your geo location is taking longer than expected, please try again later')).
'}');
}
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 81da9edc0..432ea78d5 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -426,10 +426,18 @@ class NoticeListItem extends Widget
if (empty($name)) {
$latdms = $this->decimalDegreesToDMS(abs($lat));
$londms = $this->decimalDegreesToDMS(abs($lon));
+ // TRANS: Used in coordinates as abbreviation of north
+ $north = _('N');
+ // TRANS: Used in coordinates as abbreviation of south
+ $south = _('S');
+ // TRANS: Used in coordinates as abbreviation of east
+ $east = _('E');
+ // TRANS: Used in coordinates as abbreviation of west
+ $west = _('W');
$name = sprintf(
_('%1$u°%2$u\'%3$u"%4$s %5$u°%6$u\'%7$u"%8$s'),
- $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0?_('N'):_('S')),
- $londms['deg'],$londms['min'], $londms['sec'],($lon>0?_('E'):_('W')));
+ $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0? $north:$south),
+ $londms['deg'],$londms['min'], $londms['sec'],($lon>0? $east:$west));
}
$url = $location->getUrl();
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/popularnoticesection.php b/lib/popularnoticesection.php
index 296ddbbb5..3f0241790 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,notice.location' .
' ORDER BY weight DESC';
$offset = 0;
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 82e0224af..504b77566 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -174,6 +174,12 @@ class ProfileAction extends OwnerDesignAction
$subbed_count = $this->profile->subscriberCount();
$notice_count = $this->profile->noticeCount();
$group_count = $this->user->getGroups()->N;
+ $age_days = (time() - strtotime($this->profile->created)) / 86400;
+ if ($age_days < 1) {
+ // Rather than extrapolating out to a bajillion...
+ $age_days = 1;
+ }
+ $daily_count = round($notice_count / $age_days);
$this->elementStart('div', array('id' => 'entity_statistics',
'class' => 'section'));
@@ -224,6 +230,12 @@ class ProfileAction extends OwnerDesignAction
$this->element('dd', null, $notice_count);
$this->elementEnd('dl');
+ $this->elementStart('dl', 'entity_daily_notices');
+ // TRANS: Average count of posts made per day since account registration
+ $this->element('dt', null, _('Daily average'));
+ $this->element('dd', null, $daily_count);
+ $this->elementEnd('dl');
+
$this->elementEnd('div');
}
diff --git a/lib/util.php b/lib/util.php
index 049001aba..2a90b56a9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -849,7 +849,7 @@ function common_linkify($url) {
}
if (!empty($f)) {
- if ($f->getEnclosure()) {
+ if ($f->getEnclosure() || File_oembed::staticGet('file_id',$f->id)) {
$is_attachment = true;
$attachment_id = $f->id;
@@ -872,10 +872,10 @@ function common_linkify($url) {
return XMLStringer::estring('a', $attrs, $url);
}
-function common_shorten_links($text)
+function common_shorten_links($text, $always = false)
{
$maxLength = Notice::maxContent();
- if ($maxLength == 0 || mb_strlen($text) <= $maxLength) return $text;
+ if (!$always && ($maxLength == 0 || mb_strlen($text) <= $maxLength)) return $text;
return common_replace_urls_callback($text, array('File_redirection', 'makeShort'));
}
@@ -1096,24 +1096,38 @@ function common_date_string($dt)
if ($now < $t) { // that shouldn't happen!
return common_exact_date($dt);
} else if ($diff < 60) {
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return _('a few seconds ago');
} else if ($diff < 92) {
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return _('about a minute ago');
} else if ($diff < 3300) {
+ // XXX: should support plural.
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return sprintf(_('about %d minutes ago'), round($diff/60));
} else if ($diff < 5400) {
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return _('about an hour ago');
} else if ($diff < 22 * 3600) {
+ // XXX: should support plural.
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return sprintf(_('about %d hours ago'), round($diff/3600));
} else if ($diff < 37 * 3600) {
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return _('about a day ago');
} else if ($diff < 24 * 24 * 3600) {
+ // XXX: should support plural.
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return sprintf(_('about %d days ago'), round($diff/(24*3600)));
} else if ($diff < 46 * 24 * 3600) {
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return _('about a month ago');
} else if ($diff < 330 * 24 * 3600) {
+ // XXX: should support plural.
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return sprintf(_('about %d months ago'), round($diff/(30*24*3600)));
} else if ($diff < 480 * 24 * 3600) {
+ // TRANS: Used in notices to indicate when the notice was made compared to now.
return _('about a year ago');
} else {
return common_exact_date($dt);
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 b6ca4a23e..4e190e45a 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:08+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:00:28+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,14 +179,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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."
@@ -197,22 +197,22 @@ msgstr "Opdaterings van %1$s en vriende op %2$s."
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -221,12 +221,12 @@ msgstr "Die API-funksie is nie gevind nie."
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -588,8 +588,8 @@ msgstr ""
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -597,8 +597,8 @@ msgid "Nickname"
msgstr "Bynaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Wagwoord"
@@ -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:108
msgid "This method requires a POST or DELETE."
msgstr "Hierdie metode vereis 'n POST of DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nie gevind nie."
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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"
@@ -1457,7 +1457,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Nie 'n geldige e-posadres nie."
@@ -1680,13 +1680,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Geen profiel verskaf nie."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Daar is geen profiel met daardie ID nie."
@@ -1820,7 +1820,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,50 +2197,50 @@ msgstr "U is nie 'n lid van daardie groep nie."
msgid "%1$s left group %2$s"
msgstr "%1$s het die groep %2$s verlaat"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U is reeds aangeteken."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Verkeerde gebruikersnaam of wagwoord."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanteken"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Teken aan"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Onthou my"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Wagwoord verloor of vergeet?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Verkeerde gebruikersnaam of wagwoord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2436,31 +2436,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2563,7 +2563,7 @@ msgid "6 or more characters"
msgstr "6 of meer karakters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bevestig"
@@ -2575,11 +2575,11 @@ msgstr "Dieselfde as wagwoord hierbo"
msgid "Change"
msgstr "Wysig"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Wagwoord moet 6 of meer karakters bevat."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Wagwoorde is nie dieselfde nie."
@@ -2800,43 +2800,43 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Tuisblad"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ligging"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2876,7 +2876,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3120,7 +3120,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3128,78 +3128,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Die registrasie is voltooi"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3218,7 +3240,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.)"
@@ -3293,7 +3315,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"
@@ -3361,7 +3383,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"
@@ -3418,7 +3440,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"
@@ -3429,7 +3451,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"
@@ -4348,7 +4370,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"
@@ -4469,29 +4491,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 "
@@ -4499,7 +4521,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 "
@@ -4507,39 +4529,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:779
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 ""
@@ -4578,45 +4600,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5201,11 +5223,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"
@@ -5296,14 +5318,14 @@ msgstr "Volle naam: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Ligging: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Tuisblad: %s"
@@ -5781,8 +5803,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5798,19 +5827,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Beskrywing: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5824,30 +5853,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5864,13 +5893,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuwe privaat boodskap vanaf %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5890,13 +5919,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5918,7 +5947,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5926,13 +5955,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5969,7 +5998,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"
@@ -6123,23 +6152,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 ""
@@ -6249,7 +6278,7 @@ msgstr "Daaglikse gemiddelde"
msgid "All groups"
msgstr "Alle groepe"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6273,7 +6302,7 @@ msgstr "Uitgelig"
msgid "Popular"
msgstr "Gewild"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6294,7 +6323,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6472,56 +6501,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 44a1607da..7c2aed1fb 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-29 23:21+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:11+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:00:33+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -85,24 +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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "لا مستخدم كهذا."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s والأصدقاء, الصÙحة %2$d"
@@ -123,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -163,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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -178,14 +178,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 ""
@@ -196,22 +196,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -220,12 +220,12 @@ msgstr "لم يتم العثور على وسيلة API."
#: 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:209
+#: 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."
@@ -255,7 +255,7 @@ msgstr "لم يمكن Ø­Ùظ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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
@@ -312,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:114
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 "تعذّر حذ٠المÙضلة."
@@ -379,119 +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
+#: 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
#, 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"
@@ -507,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
@@ -582,8 +582,8 @@ msgstr ""
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -591,8 +591,8 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "كلمة السر"
@@ -608,11 +608,11 @@ msgstr "اسمح"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr ""
@@ -629,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "لم يوجد."
-#: actions/apistatusesupdate.php:316 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 ""
@@ -656,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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمني العام"
-#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -696,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 ""
@@ -758,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 "احذÙ"
@@ -798,11 +798,11 @@ msgstr "Ø­Ùذ٠الأÙتار."
msgid "You already blocked that user."
msgstr "لقد منعت مسبقا هذا المستخدم."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "امنع المستخدم"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -814,7 +814,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -823,7 +823,7 @@ msgstr "لا"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -832,7 +832,7 @@ msgstr "لا تمنع هذا المستخدم"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -840,11 +840,11 @@ msgid "Yes"
msgstr "نعم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ùشل Ø­Ùظ معلومات المنع."
@@ -1002,7 +1002,7 @@ msgstr "احذ٠هذا التطبيق"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "لست والجًا."
@@ -1031,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 "احذ٠هذا الإشعار"
@@ -1443,7 +1443,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1666,13 +1666,13 @@ msgstr "المستخدم مسكت من قبل."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "لا مل٠شخصي Ù…Ùحدّد."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "لا مل٠شخصي بهذه الهوية."
@@ -1806,7 +1806,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 الزمني"
@@ -2185,51 +2185,51 @@ msgstr "لست عضوا ÙÙŠ تلك المجموعة."
msgid "%1$s left group %2$s"
msgstr "%1$s ترك المجموعة %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالÙعل."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست Ù…Ùصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ù„Ùج"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ù„Ùج إلى الموقع"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Ù„Ùج تلقائيًا ÙÙŠ المستقبل؛ هذا الخيار ليس Ù…Ùعدًا للحواسيب المشتركة!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمة السر؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"لأسباب أمنية، من Ùضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Ù„Ùج باسم مستخدم وكلمة سر"
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2426,31 +2426,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -2553,7 +2553,7 @@ msgid "6 or more characters"
msgstr "6 أحر٠أو أكثر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -2565,11 +2565,11 @@ msgstr "Ù†Ùس كلمة السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمة السر 6 حرو٠أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -2791,43 +2791,43 @@ msgstr "معلومات المل٠الشخصي"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 حرÙًا إنجليزيًا أو رقمًا بدون نقاط أو مساÙات"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصÙحة الرئيسية"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "مسار صÙحتك الرئيسية أو مدونتك أو ملÙÙƒ الشخصي على موقع آخر"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "تكلم عن Ù†Ùسك واهتمامتك ÙÙŠ %d حرÙ"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "صÙÙ Ù†Ùسك واهتماماتك"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "السيرة"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
@@ -2868,7 +2868,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "اشترك تلقائيًا بأي شخص يشترك بي (ÙŠÙضل أن يستخدم لغير البشر)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3118,7 +3118,7 @@ msgstr "يجب أن تكون كلمة السر 6 محار٠أو أكثر."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -3126,78 +3126,100 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "عذرا، رمز دعوة غير صالح."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3216,7 +3238,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.)"
@@ -3291,7 +3313,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 "مكرر"
@@ -3361,7 +3383,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 "ستاتس نت"
@@ -3418,7 +3440,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 "الاسم"
@@ -3429,7 +3451,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 "الوصÙ"
@@ -4364,7 +4386,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "الرخصة"
@@ -4485,18 +4507,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, "
@@ -4505,11 +4527,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 "
@@ -4517,7 +4539,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 "
@@ -4525,39 +4547,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:779
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 ""
@@ -4596,46 +4618,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -5228,11 +5250,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 "تغيير كلمة السر غير مسموح به"
@@ -5326,14 +5348,14 @@ msgstr "الاسم الكامل: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "الصÙحة الرئيسية: %s"
@@ -5871,8 +5893,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5898,19 +5927,19 @@ msgstr ""
"غيّر خيارات البريد الإلكتروني والإشعار ÙÙŠ %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "السيرة: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5924,30 +5953,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "حالة %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "تأكيد الرسالة القصيرة"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "لقد نبهك %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5964,13 +5993,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "رسالة خاصة جديدة من %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5990,13 +6019,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "لقد أضا٠%s (@%s) إشعارك إلى Ù…Ùضلاته"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6018,7 +6047,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6026,13 +6055,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6069,7 +6098,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 "من"
@@ -6223,23 +6252,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 "الإشعار مكرر"
@@ -6349,7 +6378,7 @@ msgstr "المÙعدّل اليومي"
msgid "All groups"
msgstr "كل المجموعات"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6373,7 +6402,7 @@ msgstr "Ù…Ùختارون"
msgid "Popular"
msgstr "محبوبة"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
@@ -6394,7 +6423,7 @@ msgstr "كرّر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6573,56 +6602,56 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 30763d3e0..1f6b20787 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:20+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:00:49+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,14 +185,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 ""
@@ -203,22 +203,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 مش موجوده."
@@ -227,12 +227,12 @@ msgstr "الـ API method مش موجوده."
#: 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:209
+#: 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."
@@ -262,7 +262,7 @@ msgstr "لم يمكن Ø­Ùظ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -590,8 +590,8 @@ msgstr ""
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -599,8 +599,8 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "كلمه السر"
@@ -616,11 +616,11 @@ msgstr "اسمح"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "لم يوجد."
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمنى العام"
-#: actions/apitimelinepublic.php:201 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 "Ùشل Ø­Ùظ معلومات المنع."
@@ -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 "احذ٠هذا الإشعار"
@@ -1466,7 +1466,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1692,13 +1692,13 @@ msgstr "المستخدم مسكت من قبل."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "لا مل٠شخصى Ù…Ùحدّد."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "لا مل٠شخصى بهذه الهويه."
@@ -1832,7 +1832,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,50 +2210,50 @@ msgstr "لست عضوا ÙÙ‰ تلك المجموعه."
msgid "%1$s left group %2$s"
msgstr "%1$s ساب جروپ %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالÙعل."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست Ù…Ùصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ù„Ùج"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ù„Ùج إلى الموقع"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمه السر؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2450,31 +2450,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr " مش نظام بيانات مدعوم."
@@ -2577,7 +2577,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -2589,11 +2589,11 @@ msgstr "Ù†Ùس كلمه السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمه السر 6 حرو٠أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -2814,43 +2814,43 @@ msgstr "معلومات المل٠الشخصي"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصÙحه الرئيسية"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "صÙÙ Ù†Ùسك واهتماماتك"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "السيرة"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2890,7 +2890,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3140,7 +3140,7 @@ msgstr "يجب أن تكون كلمه السر 6 محار٠أو أكثر."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -3148,78 +3148,100 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "عذرا، رمز دعوه غير صالح."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3238,7 +3260,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.)"
@@ -3313,7 +3335,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 "مكرر"
@@ -3383,7 +3405,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"
@@ -3441,7 +3463,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 "الاسم"
@@ -3452,7 +3474,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 "الوصÙ"
@@ -4388,7 +4410,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,29 +4531,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 "
@@ -4539,7 +4561,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 "
@@ -4547,39 +4569,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:779
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 ""
@@ -4619,46 +4641,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -5273,11 +5295,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 "تغيير الپاسوورد مش مسموح"
@@ -5371,14 +5393,14 @@ msgstr "الاسم الكامل: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "الصÙحه الرئيسية: %s"
@@ -5866,8 +5888,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5883,19 +5912,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "عن Ù†Ùسك: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5909,30 +5938,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "حاله %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5949,13 +5978,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "رساله خاصه جديده من %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5975,13 +6004,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6003,7 +6032,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6011,13 +6040,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6054,7 +6083,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 "من"
@@ -6209,23 +6238,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 "الإشعار مكرر"
@@ -6335,7 +6364,7 @@ msgstr ""
msgid "All groups"
msgstr "كل المجموعات"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6359,7 +6388,7 @@ msgstr "Ù…Ùختارون"
msgid "Popular"
msgstr "مشهورة"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
@@ -6380,7 +6409,7 @@ msgstr "كرر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6560,56 +6589,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 650bfdc93..d39b54718 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:24+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:00:53+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -179,14 +179,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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."
@@ -197,22 +197,22 @@ msgstr "Бележки от %1$s и приÑтели в %2$s."
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -221,12 +221,12 @@ msgstr "Ðе е открит методът в API."
#: 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:209
+#: 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."
@@ -256,7 +256,7 @@ msgstr "Грешка при запазване на профила."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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,121 +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
+#: 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"
@@ -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
@@ -590,8 +590,8 @@ msgstr ""
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -599,8 +599,8 @@ msgid "Nickname"
msgstr "ПÑевдоним"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Парола"
@@ -617,11 +617,11 @@ msgstr "Ð’Ñички"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Този метод изиÑква заÑвка POST или DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Ðе може да изтривате бележки на друг потребител."
@@ -638,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе е открито."
-#: actions/apistatusesupdate.php:316 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 ""
@@ -665,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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Общ поток на %s"
-#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -705,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."
@@ -770,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 "Изтриване"
@@ -810,11 +810,11 @@ msgstr "Ðватарът е изтрит."
msgid "You already blocked that user."
msgstr "Вече Ñте блокирали този потребител."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокиране на потребителÑ"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -826,7 +826,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -835,7 +835,7 @@ msgstr "Ðе"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Да не Ñе блокира този потребител"
@@ -844,7 +844,7 @@ msgstr "Да не Ñе блокира този потребител"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -852,11 +852,11 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокиране на потребителÑ"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Грешка при запиÑване данните за блокирането."
@@ -1015,7 +1015,7 @@ msgstr "Изтриване на това приложение"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ðе Ñте влезли в ÑиÑтемата."
@@ -1044,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 "Изтриване на бележката"
@@ -1475,7 +1475,7 @@ msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреÑа на е-пощата"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ðеправилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща."
@@ -1710,13 +1710,13 @@ msgstr "ПотребителÑÑ‚ вече е заглушен."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ðе е указан профил."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðе е открит профил Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
@@ -1858,7 +1858,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"
@@ -2281,40 +2281,40 @@ msgstr "Ðе членувате в тази група."
msgid "%1$s left group %2$s"
msgstr "%1$s напуÑна групата %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Вече Ñте влезли."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Вход в Ñайта"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Ðвтоматично влизане занапред. Да не Ñе ползва на общи компютри!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Загубена или забравена парола"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2322,12 +2322,12 @@ msgstr ""
"За по-голÑма ÑигурноÑÑ‚, Ð¼Ð¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ отново потребителÑкото Ñи име и парола "
"при промÑна на наÑтройките."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Вход Ñ Ð¸Ð¼Ðµ и парола"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2535,31 +2535,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Ðеподдържан формат на данните"
@@ -2669,7 +2669,7 @@ msgid "6 or more characters"
msgstr "6 или повече знака"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Потвърждаване"
@@ -2681,11 +2681,11 @@ msgstr "Също като паролата по-горе"
msgid "Change"
msgstr "ПромÑна"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Паролата Ñ‚Ñ€Ñбва да е 6 или повече знака."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Паролите не Ñъвпадат."
@@ -2908,43 +2908,43 @@ msgstr "Данни на профила"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "От 1 до 64 малки букви или цифри, без Ð¿ÑƒÐ½ÐºÑ‚Ð¾Ð°Ñ†Ð¸Ñ Ð¸ интервали"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Пълно име"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Лична Ñтраница"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° личната ви Ñтраница, блог или профил в друг Ñайт"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишете Ñебе Ñи и интереÑите Ñи в до %d букви"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишете Ñебе Ñи и интереÑите Ñи"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "За мен"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "МеÑтоположение"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Къде Ñе намирате (град, община, държава и Ñ‚.н.)"
@@ -2986,7 +2986,7 @@ msgstr ""
"Ðвтоматично абониране за вÑеки, който Ñе абонира за мен (подходÑщо за "
"ботове)."
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "БиографиÑта е твърде дълга (до %d Ñимвола)."
@@ -3234,7 +3234,7 @@ msgstr "Паролата Ñ‚Ñ€Ñбва да е от поне 6 знака."
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не Ñъвпадат."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Грешка в наÑтройките на потребителÑ."
@@ -3242,81 +3242,103 @@ msgstr "Грешка в наÑтройките на потребителÑ."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовата парола е запазена. ВлÑзохте уÑпешно."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Грешка в кода за потвърждение."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "ЗапиÑването е уÑпешно."
-#: actions/register.php:114 actions/register.php: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 "
@@ -3349,7 +3371,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.)"
@@ -3432,7 +3454,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 "Повторено"
@@ -3502,7 +3524,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"
@@ -3562,7 +3584,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 "Име"
@@ -3573,7 +3595,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 "ОпиÑание"
@@ -4528,7 +4550,7 @@ msgstr ""
"Проверете тези детайли и Ñе уверете, че иÑкате да Ñе абонирате за бележките "
"на този потребител. Ðко не иÑкате абонамента, натиÑнете \"Cancel\" (Отказ)."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Лиценз"
@@ -4657,29 +4679,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 "
@@ -4687,7 +4709,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 "
@@ -4695,39 +4717,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:779
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 ""
@@ -4771,28 +4793,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 "
@@ -4801,22 +4823,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5433,12 +5455,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 "Паролата е запиÑана."
@@ -5534,14 +5556,14 @@ msgstr "Пълно име: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "МеÑтоположение: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Домашна Ñтраница: %s"
@@ -6028,8 +6050,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s вече получава бележките ви в %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6055,19 +6084,19 @@ msgstr ""
"Може да Ñмените адреÑа и наÑтройките за уведомÑване по е-поща на %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "БиографиÑ: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðов Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща за публикщуване в %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6081,30 +6110,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "СъÑтоÑние на %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Потвърждение за SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Очаква Ñе потвърждение за този телефонен номер."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Побутнати Ñте от %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6121,13 +6150,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ðово лично Ñъобщение от %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6147,13 +6176,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) отбелÑза бележката ви като любима"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6175,7 +6204,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6183,13 +6212,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6226,7 +6255,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 "от"
@@ -6382,23 +6411,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 "Бележката е повторена."
@@ -6511,7 +6540,7 @@ msgstr ""
msgid "All groups"
msgstr "Ð’Ñички групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6535,7 +6564,7 @@ msgstr "Избрано"
msgid "Popular"
msgstr "ПопулÑрно"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "ЛипÑват аргументи return-to."
@@ -6556,7 +6585,7 @@ msgstr "ПовтарÑне на тази бележка"
msgid "Revoke the \"%s\" role from this user"
msgstr "СпиÑък Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ в тази група."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6739,56 +6768,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "преди нÑколко Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "преди около чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "преди около меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "преди около %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 2ab02917b..5b121ceb3 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:27+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:00:57+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -177,14 +177,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -195,22 +195,22 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 !"
@@ -219,12 +219,12 @@ msgstr "N'eo ket bet kavet an hentenn API !"
#: 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:209
+#: 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."
@@ -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:222 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:114
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
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
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
@@ -581,8 +581,8 @@ msgstr ""
msgid "Account"
msgstr "Kont"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -590,8 +590,8 @@ msgid "Nickname"
msgstr "Lesanv"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Ger-tremen"
@@ -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:108
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:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "N'eo ket bet kavet."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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,7 +813,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -822,7 +822,7 @@ msgstr "Nann"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Arabat stankañ an implijer-mañ"
@@ -831,7 +831,7 @@ msgstr "Arabat stankañ an implijer-mañ"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -839,11 +839,11 @@ msgid "Yes"
msgstr "Ya"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Diposubl eo enrollañ an titouroù stankañ."
@@ -1002,7 +1002,7 @@ msgstr "Dilemel ar poelad-se"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nann-luget."
@@ -1031,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ñ"
@@ -1443,7 +1443,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "N'eo ket ur chomlec'h postel reizh."
@@ -1633,9 +1633,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."
@@ -1663,13 +1662,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ñ."
@@ -1803,7 +1802,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"
@@ -2181,43 +2180,43 @@ msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
msgid "%1$s left group %2$s"
msgstr "%1$s en deus kuitaet ar strollad %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Kevreet oc'h dija."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
"evit en ober."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Kevreañ"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Kevreañ d'al lec'hienn"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Kaout soñj"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
"urzhiataeroù rannet pe publik !"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ha kollet o peus ho ker-tremen ?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2225,11 +2224,11 @@ msgstr ""
"Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-"
"tremen a-benn enrollañ ho penndibaboù."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2428,30 +2427,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2554,7 +2553,7 @@ msgid "6 or more characters"
msgstr "6 arouezenn pe muioc'h"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Kadarnaat"
@@ -2566,11 +2565,11 @@ msgstr "Memestra eget ar ger tremen a-us"
msgid "Change"
msgstr "Kemmañ"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Ne glot ket ar gerioù-tremen."
@@ -2794,43 +2793,43 @@ msgstr "Titouroù ar profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Anv klok"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pajenn degemer"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Buhezskrid"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Lec'hiadur"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
@@ -2874,7 +2873,7 @@ msgstr ""
"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
"evit an implijerien nann-denel)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
@@ -3129,7 +3128,7 @@ msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
msgid "Password and confirmation do not match."
msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
@@ -3137,82 +3136,104 @@ msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
msgid "New password successfully saved. You are now logged in."
msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
"enskrivañ."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Digarezit, kod pedadenn direizh."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Krouet eo bet ar gont."
-#: actions/register.php:114 actions/register.php: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 "N'eo ket aotreet krouiñ kontoù."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
"gont."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Implijet eo dija ar chomlec'h postel-se."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 arouezenn pe muioc'h. Rekis."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Memestra hag ar ger-tremen a-us. Rekis."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Postel"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
-#: actions/register.php: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 +3252,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.)"
@@ -3308,7 +3329,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"
@@ -3377,7 +3398,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"
@@ -3434,7 +3455,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"
@@ -3445,7 +3466,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"
@@ -4368,7 +4389,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"
@@ -4489,29 +4510,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 "
@@ -4519,7 +4540,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 "
@@ -4527,39 +4548,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:779
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 ""
@@ -4598,45 +4619,45 @@ 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 "Ur gudenn 'zo bet pa veze enrollet an ali."
-#: classes/Notice.php:967
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5220,11 +5241,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 "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 "N'eo ket aotreet kemmañ ar ger-tremen"
@@ -5319,14 +5340,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"
@@ -5807,8 +5828,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"
@@ -5824,19 +5852,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr ""
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Chomlec'h postel nevez evit embann e %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5850,30 +5878,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Statud %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Kadarnadur SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5890,13 +5918,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"
@@ -5916,13 +5944,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"
@@ -5944,21 +5972,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"
@@ -5995,7 +6026,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"
@@ -6065,7 +6096,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
@@ -6149,23 +6180,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"
@@ -6183,11 +6214,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"
@@ -6275,7 +6306,7 @@ msgstr "Keidenn pemdeziek"
msgid "All groups"
msgstr "An holl strolladoù"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6289,7 +6320,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"
@@ -6299,7 +6330,7 @@ msgstr ""
msgid "Popular"
msgstr "Poblek"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6320,7 +6351,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 ""
@@ -6498,56 +6529,56 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
@@ -6559,7 +6590,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 b12c03a1c..e5de380b4 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:30+0000\n"
+"POT-Creation-Date: 2010-05-27 22:55+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01: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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -88,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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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,10 +114,10 @@ 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
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s i amics, pàgina %2$d"
@@ -126,73 +125,78 @@ 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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 "
-"envieu quelcom personal."
+"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:143
#, 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:146 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:179
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:215
-#: 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!"
@@ -203,22 +207,22 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 "No s'ha trobat el mètode API!"
@@ -227,12 +231,12 @@ msgstr "No s'ha trobat el mètode API!"
#: 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:209
+#: 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."
@@ -264,7 +268,7 @@ msgstr "No s'ha pogut desar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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
@@ -297,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
@@ -323,67 +327,66 @@ 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:114
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."
@@ -393,121 +396,121 @@ msgstr "No s'ha pogut determinar l'usuari d'origen."
msgid "Could not find target user."
msgstr "No s'ha pogut trobar l'usuari de destinació."
-#: 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"
@@ -522,15 +525,15 @@ 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
@@ -558,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.
@@ -591,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
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
@@ -606,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"
@@ -623,13 +631,13 @@ msgstr "Permet"
msgid "Allow or deny access to your account information."
msgstr "Permet o denega l'accés a la informació del vostre compte."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Aquest mètode requereix POST o DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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
@@ -644,25 +652,25 @@ 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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "No s'ha trobat."
-#: actions/apistatusesupdate.php:316 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 "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
@@ -671,52 +679,52 @@ msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt
msgid "Unsupported format."
msgstr "El format no està implementat."
-#: actions/apitimelinefavorites.php:109
+#: actions/apitimelinefavorites.php:110
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Preferits 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 actualitzacions preferides 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 / 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:196 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:201 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!"
@@ -738,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
@@ -774,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"
@@ -810,29 +818,32 @@ 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
msgctxt "BUTTON"
@@ -841,7 +852,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquis l'usuari"
@@ -850,7 +861,7 @@ msgstr "No bloquis l'usuari"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -858,13 +869,13 @@ 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
@@ -910,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."
@@ -922,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
@@ -963,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"
@@ -976,7 +987,7 @@ msgstr "Avisos"
#: actions/deleteapplication.php:63
msgid "You must be logged in to delete an application."
-msgstr "Heu d'haver iniciat una sessió per a suprimir una aplicació."
+msgstr "Heu d'haver iniciat una sessió per eliminar una aplicació."
#: actions/deleteapplication.php:71
msgid "Application not found."
@@ -991,11 +1002,11 @@ msgstr "No sou el propietari d'aquesta aplicació."
#: actions/newapplication.php:110 actions/showapplication.php:118
#: lib/action.php:1253
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 ""
@@ -1003,14 +1014,14 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
-"Esteu segur que voler suprimir l'aplicació? Això netejarà totes les dades de "
+"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
msgid "Do not delete this application"
-msgstr "No suprimeixis l'aplicació"
+msgstr "No eliminis l'aplicació"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
@@ -1023,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."
@@ -1068,20 +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 suprimir l'usuari? S'esborraran totes les dades de "
+"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.
@@ -1207,7 +1218,7 @@ 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"
@@ -1216,7 +1227,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"
@@ -1233,7 +1244,7 @@ msgstr "No hi ha tal aplicació."
#: actions/editapplication.php:161
msgid "Use this form to edit your application."
-msgstr "Utilitza el formulari per a editar la vostra aplicació."
+msgstr "Utilitza el formulari per editar la vostra aplicació."
#: actions/editapplication.php:177 actions/newapplication.php:159
msgid "Name is required."
@@ -1273,11 +1284,11 @@ 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
msgid "Could not update application."
@@ -1286,16 +1297,16 @@ 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
msgid "You must be an admin to edit the group."
-msgstr "Heu de ser administrador per a editar el grup."
+msgstr "Heu de ser administrador per editar el grup."
#: actions/editgroup.php:158
msgid "Use this form to edit the group."
@@ -1333,7 +1344,7 @@ msgstr "Paràmetres del correu electrònic"
#: 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.
@@ -1356,7 +1367,7 @@ msgstr "Adreça electrònica confirmada actualment."
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
-msgstr "Suprimeix"
+msgstr "Elimina"
#: actions/emailsettings.php:122
msgid ""
@@ -1400,14 +1411,13 @@ 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.
@@ -1424,15 +1434,13 @@ 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
@@ -1452,7 +1460,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
@@ -1475,7 +1483,7 @@ msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar l'adreça electrònica."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
@@ -1514,7 +1522,7 @@ 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
@@ -1535,7 +1543,7 @@ msgstr "Aquest no és el teu correu electrònic"
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
msgid "The email address was removed."
-msgstr "S'ha suprimit l'adreça de correu electrònic."
+msgstr "S'ha eliminat l'adreça de correu electrònic."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1560,25 +1568,25 @@ 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."
@@ -1607,7 +1615,7 @@ msgstr ""
#: 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
#, php-format
@@ -1655,7 +1663,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."
@@ -1666,9 +1674,8 @@ 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
msgid "Remote service uses unknown version of OMB protocol."
@@ -1704,13 +1711,13 @@ msgstr "L'usuari ja té aquest rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No s'ha especificat cap perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No hi ha cap perfil amb aquesta ID."
@@ -1742,8 +1749,8 @@ msgid ""
"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 «%1$s» del grup «%2$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
@@ -1850,7 +1857,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"
@@ -1880,6 +1887,11 @@ 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"
@@ -1909,6 +1921,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
@@ -1916,6 +1930,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."
@@ -1927,7 +1943,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
@@ -1943,8 +1959,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
@@ -1981,9 +1997,9 @@ 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
@@ -2051,7 +2067,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
@@ -2061,7 +2077,7 @@ 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
msgid "Couldn't delete IM confirmation."
-msgstr "No s'ha pogut suprimir la confirmació de MI."
+msgstr "No s'ha pogut eliminar la confirmació de MI."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
@@ -2077,17 +2093,17 @@ msgstr "Aquest no és el teu Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
msgid "The IM address was removed."
-msgstr "S'ha suprimit l'adreça de MI."
+msgstr "S'ha eliminat l'adreça de MI."
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr "Safata d'entrada per a %1$s - pàgina %2$d"
+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."
@@ -2103,7 +2119,7 @@ msgstr "S'han inhabilitat les invitacions."
#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr ""
-"Heu d'haver iniciat una sessió per a convidar altres usuaris a utilitzar %s"
+"Heu d'haver iniciat una sessió per convidar altres usuaris a utilitzar %s"
#: actions/invite.php:72
#, php-format
@@ -2112,11 +2128,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:"
@@ -2156,11 +2172,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"
@@ -2242,7 +2258,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."
@@ -2257,7 +2273,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."
@@ -2270,55 +2286,55 @@ msgstr "No ets membre d'aquest grup."
msgid "%1$s left group %2$s"
msgstr "%1$s ha abandonat el grup %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ja estàs connectat."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"S'ha produït un error en definir l'usuari. Probablement no hi esteu "
"autoritzat."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"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:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2355,7 +2371,7 @@ msgstr "Nova Aplicació"
#: actions/newapplication.php:64
msgid "You must be logged in to register an application."
-msgstr "Heu d'haver iniciat una sessió per a registrar-hi una aplicació."
+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."
@@ -2418,7 +2434,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
@@ -2444,6 +2460,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
@@ -2451,6 +2469,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
@@ -2480,7 +2500,7 @@ msgstr "Reclamació enviada!"
#: actions/oauthappssettings.php:59
msgid "You must be logged in to list your applications."
-msgstr "Heu d'haver iniciat una sessió per a llistar les vostres aplicacions."
+msgstr "Heu d'haver iniciat una sessió per llistar les vostres aplicacions."
#: actions/oauthappssettings.php:74
msgid "OAuth applications"
@@ -2510,40 +2530,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
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
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
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2553,7 +2575,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"
@@ -2561,7 +2583,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)"
@@ -2593,29 +2615,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
@@ -2630,11 +2648,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"
@@ -2653,7 +2671,7 @@ msgid "6 or more characters"
msgstr "6 o més caràcters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2665,11 +2683,11 @@ msgstr "Igual a la contrasenya de dalt"
msgid "Change"
msgstr "Canviar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Les contrasenyes no coincideixen."
@@ -2679,11 +2697,11 @@ 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."
@@ -2696,31 +2714,31 @@ 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"
@@ -2744,11 +2762,11 @@ 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"
@@ -2856,9 +2874,9 @@ 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
#, php-format
@@ -2873,6 +2891,8 @@ msgstr "El contingut de l'avís no és vàlid."
#, 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"
@@ -2882,8 +2902,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"
@@ -2894,46 +2914,45 @@ 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"
@@ -2949,33 +2968,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)."
@@ -2991,7 +3010,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."
@@ -3003,11 +3022,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
@@ -3073,16 +3092,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"
@@ -3097,6 +3120,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!"
@@ -3108,6 +3133,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"
@@ -3169,15 +3196,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"
@@ -3205,7 +3232,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."
@@ -3216,7 +3243,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
@@ -3231,7 +3258,7 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters."
msgid "Password and confirmation do not match."
msgstr "La contrasenya i la confirmació no coincideixen."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
@@ -3239,40 +3266,39 @@ msgstr "Error en configurar l'usuari."
msgid "New password successfully saved. You are now logged in."
msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "El codi d'invitació no és vàlid."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3280,45 +3306,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: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."
-#: actions/register.php:494
-#, fuzzy, php-format
+#. 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"
@@ -3335,20 +3385,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.)"
@@ -3363,10 +3415,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"
@@ -3402,18 +3454,18 @@ 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
msgid "That’s a local profile! Login to subscribe."
-msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-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
msgid "Only logged-in users can repeat notices."
@@ -3424,15 +3476,14 @@ msgid "No notice specified."
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
msgid "You already repeated that notice."
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"
@@ -3464,16 +3515,16 @@ 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
@@ -3481,6 +3532,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
@@ -3488,6 +3541,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
@@ -3495,28 +3550,24 @@ 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
+#: 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 "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
@@ -3525,9 +3576,8 @@ 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"
@@ -3551,9 +3601,8 @@ 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
msgid "Application profile"
@@ -3565,7 +3614,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 "Nom"
@@ -3576,7 +3625,7 @@ msgid "Organization"
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ó"
@@ -3597,7 +3646,7 @@ 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"
@@ -3605,19 +3654,19 @@ 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
msgid "Authorize URL"
@@ -3628,16 +3677,18 @@ 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."
@@ -3663,6 +3714,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 ""
+"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
@@ -3670,6 +3723,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
@@ -3678,6 +3733,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."
@@ -3689,9 +3747,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"
@@ -3762,9 +3820,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 "
@@ -3772,7 +3836,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"
@@ -3798,7 +3864,7 @@ msgstr "Missatge de %1$s a %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr "S'ha suprimit l'avís."
+msgstr "S'ha eliminat l'avís."
#: actions/showstream.php:73
#, php-format
@@ -3811,42 +3877,43 @@ msgid "%1$s, page %2$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
@@ -3854,6 +3921,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
@@ -3863,16 +3932,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
@@ -3888,18 +3964,16 @@ 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
#, php-format
@@ -3928,7 +4002,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"
@@ -3936,11 +4010,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"
@@ -3996,7 +4070,7 @@ msgstr "Avís del lloc"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
-msgstr "Edita el missatge per a tot el lloc"
+msgstr "Edita el missatge de tot el lloc"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
@@ -4004,15 +4078,15 @@ 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 "La mida màxima per a als avisos per a tot el lloc és de 255 caràcters."
+msgstr "La mida màxima per als avisos de tot el lloc és de 255 caràcters."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr "Text de l'avís per al lloc"
+msgstr "Text de l'avís del lloc"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters, es permet l'HTML)"
+msgstr "Text d'avís de tot el lloc (màxim 255 caràcters, es permet l'HTML)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
@@ -4050,7 +4124,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
@@ -4119,14 +4193,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
@@ -4135,9 +4208,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.
@@ -4147,9 +4219,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
@@ -4169,14 +4240,14 @@ 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
@@ -4185,25 +4256,24 @@ 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"
@@ -4215,7 +4285,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"
@@ -4223,20 +4293,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."
@@ -4248,16 +4317,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
msgid "No such profile."
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"
@@ -4332,6 +4400,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
@@ -4347,29 +4421,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
@@ -4394,15 +4467,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."
@@ -4411,7 +4484,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
@@ -4427,18 +4500,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"
@@ -4449,6 +4520,8 @@ 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
@@ -4525,17 +4598,16 @@ 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"
@@ -4546,7 +4618,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"
@@ -4558,71 +4630,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"
@@ -4642,9 +4713,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"
@@ -4658,87 +4729,103 @@ 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
+#: 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 ""
+"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
+#: actions/version.php:198 lib/action.php:779
msgid "Version"
msgstr "Versió"
-#: actions/version.php:197
+#: 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
msgid "Group join failed."
@@ -4753,14 +4840,13 @@ msgid "Group leave failed."
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."
@@ -4775,51 +4861,50 @@ 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
+#: classes/Notice.php:251
msgid "Problem saving notice. Too long."
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:967
-#, 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4837,18 +4922,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
msgid "Couldn't delete self-subscription."
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."
@@ -4864,18 +4947,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
@@ -5053,7 +5134,7 @@ msgstr "Vistes locals"
#. TRANS: DT element for page notice. String is hidden in default CSS.
#: lib/action.php:649
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
@@ -5078,7 +5159,7 @@ msgstr "Preguntes més freqüents"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
#: lib/action.php:769
msgid "TOS"
-msgstr ""
+msgstr "Termes del servei"
#. TRANS: Secondary navigation menu option leading to privacy policy.
#: lib/action.php:773
@@ -5106,7 +5187,7 @@ 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
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5142,7 +5223,7 @@ msgstr "Llicència de contingut del lloc"
#: lib/action.php:847
#, 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.
@@ -5150,17 +5231,22 @@ msgstr ""
#, 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
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
#, 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
@@ -5183,18 +5269,20 @@ msgstr "Anteriors"
#: 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:244
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "No es pot gestionar el contingut XML incrustat encara."
#: 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
@@ -5203,28 +5291,24 @@ 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
@@ -5275,20 +5359,20 @@ msgstr "Configuració de les sessions"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:397
-#, fuzzy
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
msgid "Snapshots configuration"
-msgstr "Configuració dels camins"
+msgstr "Configuració de les instantànies"
#. TRANS: Client error 401.
#: 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
@@ -5324,18 +5408,17 @@ 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
@@ -5376,12 +5459,12 @@ msgstr "Cancel·la"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr "lectura i escriptura"
+msgstr "de lectura i d'escriptura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr "només lectura"
+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
@@ -5418,14 +5501,13 @@ msgstr "Avisos on apareix l'adjunt"
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"
@@ -5440,9 +5522,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"
@@ -5451,16 +5532,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."
@@ -5468,7 +5549,7 @@ 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.
@@ -5490,7 +5571,7 @@ msgstr ""
#: 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"
@@ -5508,7 +5589,7 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
#: lib/command.php:385
#, 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
@@ -5518,14 +5599,14 @@ msgstr "Nom complet: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localització: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pàgina web: %s"
@@ -5534,7 +5615,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
@@ -5558,11 +5639,11 @@ msgstr ""
#: 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
msgid "Cannot repeat your own notice"
@@ -5584,9 +5665,9 @@ msgid "Error repeating notice."
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
@@ -5599,12 +5680,11 @@ 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
@@ -5613,12 +5693,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."
@@ -5626,19 +5706,19 @@ 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"
@@ -5652,14 +5732,13 @@ msgstr ""
"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:"
@@ -5668,9 +5747,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:"
@@ -5729,6 +5807,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. "
@@ -5740,7 +5856,7 @@ 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."
@@ -5748,11 +5864,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"
@@ -5775,10 +5891,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."
@@ -5786,11 +5903,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"
@@ -5834,7 +5951,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"
@@ -5847,27 +5964,27 @@ 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"
@@ -5880,12 +5997,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"
@@ -5894,7 +6011,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
@@ -5912,7 +6029,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
@@ -5942,7 +6059,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"
@@ -5972,7 +6089,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"
@@ -5980,7 +6097,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
@@ -6004,6 +6121,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
@@ -6011,9 +6141,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"
@@ -6026,27 +6166,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
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografia: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nou correu electrònic per publicar a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6058,40 +6202,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
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Has estat reclamat per %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6106,15 +6250,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"
@@ -6132,15 +6286,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
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha afegit el vostre avís com a preferit"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6160,23 +6328,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"
@@ -6202,6 +6389,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."
@@ -6212,8 +6422,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"
@@ -6241,20 +6454,26 @@ 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."
@@ -6266,15 +6485,15 @@ 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
msgid "Could not determine file's MIME type."
@@ -6283,16 +6502,16 @@ 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"
@@ -6309,7 +6528,7 @@ msgstr "Envia"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "Enviar notificació"
+msgstr "Envia un avís"
#: lib/noticeform.php:173
#, php-format
@@ -6337,7 +6556,7 @@ 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àfic està trigant més de "
+"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
@@ -6369,23 +6588,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 "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
+#: lib/noticelist.php:666
msgid "Notice repeated"
msgstr "Avís repetit"
@@ -6456,7 +6675,7 @@ 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:115
msgid "Unknown"
@@ -6495,7 +6714,7 @@ msgstr "Mitjana diària"
msgid "All groups"
msgstr "Tots els grups"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Mètode no implementat"
@@ -6519,7 +6738,7 @@ msgstr "Destacat"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No hi ha arguments de retorn."
@@ -6540,19 +6759,17 @@ msgstr "Repeteix l'avís"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca el rol «%s» de l'usuari"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
-msgstr ""
+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"
@@ -6576,15 +6793,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"
@@ -6592,7 +6809,7 @@ msgstr "Secció sense títol"
#: lib/section.php:106
msgid "More..."
-msgstr "Més…"
+msgstr "Més..."
#: lib/silenceform.php:67
msgid "Silence"
@@ -6610,7 +6827,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
@@ -6624,17 +6841,17 @@ 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"
@@ -6642,16 +6859,15 @@ msgstr "Cap"
#: 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"
@@ -6663,11 +6879,11 @@ 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
#, php-format
@@ -6684,7 +6900,7 @@ msgstr "Accions de l'usuari"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr "S'està suprimint l'usuari..."
+msgstr "S'està eliminant l'usuari..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
@@ -6696,7 +6912,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"
@@ -6721,56 +6937,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fa pocs segons"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fa un minut"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fa una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fa un dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fa un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "fa un any"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 2180ad6ce..377716803 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:33+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:05+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,15 +185,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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 ""
@@ -204,22 +204,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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"
@@ -229,12 +229,12 @@ msgstr "Potvrzující kód nebyl nalezen"
#: 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:209
+#: 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 ""
@@ -266,7 +266,7 @@ msgstr "Nelze uložit profil"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -605,8 +605,8 @@ msgstr ""
msgid "Account"
msgstr "O nás"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -614,8 +614,8 @@ msgid "Nickname"
msgstr "Přezdívka"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Heslo"
@@ -632,11 +632,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 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:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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í"
@@ -1519,7 +1519,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
@@ -1756,13 +1756,13 @@ msgstr "Uživatel nemá profil."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1906,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 ""
@@ -2303,51 +2303,51 @@ msgstr "Neodeslal jste nám profil"
msgid "%1$s left group %2$s"
msgstr "%1 statusů na %2"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Již přihlášen"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Zapamatuj si mÄ›"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "PříštÄ› automaticky pÅ™ihlásit; ne pro poÄítaÄe, které používá "
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ztracené nebo zapomenuté heslo?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "Z bezpeÄnostních důvodů, prosím zadejte znovu své jméno a heslo."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2552,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 "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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2688,7 +2688,7 @@ msgid "6 or more characters"
msgstr "6 a více znaků"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Heslo znovu"
@@ -2700,11 +2700,11 @@ msgstr "Stejné jako heslo výše"
msgid "Change"
msgstr "Změnit"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hesla nesouhlasí"
@@ -2940,43 +2940,43 @@ msgstr "Neznámý profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 znaků nebo Äísel, bez teÄek, Äárek a mezer"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Celé jméno"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Moje stránky"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Popiš sebe a své zájmy ve 140 znacích"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Popište sebe a své zájmy"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "O mÄ›"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Umístění"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Místo. Město, stát."
@@ -3016,7 +3016,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
@@ -3268,7 +3268,7 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé"
msgid "Password and confirmation do not match."
msgstr "Heslo a potvrzení nesouhlasí"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
@@ -3276,72 +3276,94 @@ msgstr "Chyba nastavení uživatele"
msgid "New password successfully saved. You are now logged in."
msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Chyba v ověřovacím kódu"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:114 actions/register.php: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, "
@@ -3350,7 +3372,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 "
@@ -3369,7 +3391,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 +3475,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"
@@ -3525,7 +3547,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"
@@ -3587,7 +3609,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 +3622,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"
@@ -4560,7 +4582,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"
@@ -4691,29 +4713,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 "
@@ -4721,7 +4743,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 "
@@ -4729,40 +4751,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:779
#, 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 ""
@@ -4805,48 +4827,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5476,12 +5498,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"
@@ -5576,14 +5598,14 @@ msgstr "Celé jméno"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6083,8 +6105,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1 od teÄ naslouchá tvým sdÄ›lením v %2"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6106,19 +6135,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "O mÄ›"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6132,30 +6161,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6172,13 +6201,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6198,13 +6227,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1 od teÄ naslouchá tvým sdÄ›lením v %2"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6226,7 +6255,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6234,13 +6263,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6277,7 +6306,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 "
@@ -6438,26 +6467,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í"
@@ -6569,7 +6598,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6594,7 +6623,7 @@ msgstr ""
msgid "Popular"
msgstr "Hledání lidí"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Žádný takový dokument."
@@ -6618,7 +6647,7 @@ msgstr "Odstranit toto oznámení"
msgid "Revoke the \"%s\" role from this user"
msgstr "Žádný takový uživatel."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6805,56 +6834,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "před pár sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "asi před minutou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "asi před hodinou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "asi přede dnem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "asi před měsícem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index eda01937a..9f66162dc 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
# Author@translatewiki.net: Michael
# Author@translatewiki.net: Michi
# Author@translatewiki.net: Pill
+# Author@translatewiki.net: The Evil IP address
# Author@translatewiki.net: Umherirrender
# --
# This file is distributed under the same license as the StatusNet package.
@@ -15,12 +16,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-29 23:21+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:36+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:09+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -91,24 +92,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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Seite nicht vorhanden"
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 +122,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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s und Freunde, Seite% 2$d"
@@ -129,33 +130,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -163,7 +164,7 @@ msgstr ""
"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas "
"gepostet."
-#: actions/all.php:139
+#: actions/all.php:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -173,7 +174,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -183,7 +184,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -194,14 +195,14 @@ msgstr ""
"erregen?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -212,22 +213,22 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -236,12 +237,12 @@ msgstr "API-Methode nicht gefunden."
#: 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:209
+#: 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."
@@ -273,7 +274,7 @@ msgstr "Konnte Profil nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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
@@ -332,44 +333,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:114
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."
@@ -402,122 +403,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
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%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
+#: 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
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
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 +533,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
@@ -610,8 +611,8 @@ msgstr ""
msgid "Account"
msgstr "Profil"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +620,8 @@ msgid "Nickname"
msgstr "Nutzername"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passwort"
@@ -636,11 +637,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:108
msgid "This method requires a POST or DELETE."
msgstr "Diese Methode benötigt ein POST oder DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
@@ -657,26 +658,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nicht gefunden."
-#: actions/apistatusesupdate.php:316 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 +688,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."
-#: actions/apitimelinepublic.php:196 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:201 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 +728,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 +791,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 +832,11 @@ msgstr "Avatar gelöscht."
msgid "You already blocked that user."
msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Benutzer blockieren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -850,7 +851,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -859,7 +860,7 @@ msgstr "Nein"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Diesen Benutzer freigeben"
@@ -868,7 +869,7 @@ msgstr "Diesen Benutzer freigeben"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -876,11 +877,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
@@ -1040,7 +1041,7 @@ msgstr "Programm löschen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nicht angemeldet."
@@ -1071,7 +1072,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"
@@ -1494,7 +1495,7 @@ msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
@@ -1722,13 +1723,13 @@ msgstr "Nutzer hat diese Aufgabe bereits"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Kein Profil angegeben."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Kein Benutzer-Profil mit dieser ID."
@@ -1870,7 +1871,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"
@@ -2302,40 +2303,40 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
msgid "%1$s left group %2$s"
msgstr "%1$s hat die Gruppe %2$s verlassen"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Bereits angemeldet."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Falscher Benutzername oder Passwort."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Anmelden"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Passwort vergessen?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2343,11 +2344,11 @@ msgstr ""
"Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
"ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Mit Nutzernamen und Passwort anmelden."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2559,30 +2560,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
+#: 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
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
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 "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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2686,7 +2687,7 @@ msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bestätigen"
@@ -2698,11 +2699,11 @@ msgstr "Gleiches Passwort wie zuvor"
msgid "Change"
msgstr "Ändern"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passwörter stimmen nicht überein."
@@ -2929,44 +2930,44 @@ msgstr "Profilinformation"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Vollständiger Name"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beschreibe dich selbst und deine Interessen in %d Zeichen"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beschreibe dich selbst und deine Interessen"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografie"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Aufenthaltsort"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
@@ -3010,7 +3011,7 @@ msgstr ""
"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
"Menschen)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. %d Zeichen)"
@@ -3274,7 +3275,7 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten"
msgid "Password and confirmation do not match."
msgstr "Passwort und seine Bestätigung stimmen nicht überein."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Fehler bei den Nutzereinstellungen."
@@ -3282,40 +3283,40 @@ msgstr "Fehler bei den Nutzereinstellungen."
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Entschuldigung, ungültiger Bestätigungscode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php: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
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3323,37 +3324,60 @@ msgstr ""
"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
"Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
"Pflicht."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 oder mehr Buchstaben. Pflicht."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-Mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Wird nur für Updates, wichtige Mitteilungen und zur "
"Passwortwiederherstellung verwendet"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längerer Name, bevorzugt dein „echter“ Name"
-#: actions/register.php:494
+#: 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, "
@@ -3362,7 +3386,7 @@ msgstr ""
"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und "
"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3395,7 +3419,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.)"
@@ -3477,7 +3501,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"
@@ -3552,7 +3576,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"
@@ -3609,7 +3633,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"
@@ -3620,7 +3644,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"
@@ -4255,7 +4279,7 @@ 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."
@@ -4599,7 +4623,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"
@@ -4655,17 +4679,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
@@ -4729,18 +4753,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, "
@@ -4749,11 +4773,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 "
@@ -4765,7 +4789,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 "
@@ -4777,7 +4801,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 "
@@ -4786,20 +4810,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:779
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 "
@@ -4808,12 +4832,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 ""
@@ -4854,27 +4878,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
+#: 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."
@@ -4882,22 +4906,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5491,11 +5515,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"
@@ -5589,14 +5613,14 @@ msgstr "Vollständiger Name: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Standort: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -6131,8 +6155,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6159,19 +6190,19 @@ msgstr ""
"$s ändern.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografie: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6193,18 +6224,18 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s Status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-Konfiguration"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
@@ -6212,13 +6243,13 @@ msgstr ""
"handelt:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du wurdest von %s angestupst"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6246,13 +6277,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Neue private Nachricht von %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6286,13 +6317,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6324,7 +6355,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6335,14 +6366,14 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
"%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6405,7 +6436,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"
@@ -6567,23 +6598,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"
@@ -6693,7 +6724,7 @@ msgstr "Tagesdurchschnitt"
msgid "All groups"
msgstr "Alle Gruppen"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Nicht unterstützte Methode."
@@ -6717,7 +6748,7 @@ msgstr "Beliebte Benutzer"
msgid "Popular"
msgstr "Beliebte Beiträge"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Kein Rückkehr Argument."
@@ -6738,7 +6769,7 @@ msgstr "Diese Nachricht wiederholen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt."
@@ -6916,56 +6947,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "vor einer Minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "vor einer Stunde"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "vor einem Tag"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "vor einem Monat"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "vor einem Jahr"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index a75fef345..c76caba54 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:39+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:19+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -184,14 +184,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 ""
@@ -202,22 +202,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
@@ -227,12 +227,12 @@ msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
#: 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:209
+#: 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 ""
@@ -264,7 +264,7 @@ msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -598,8 +598,8 @@ msgstr ""
msgid "Account"
msgstr "ΛογαÏιασμός"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -607,8 +607,8 @@ msgid "Nickname"
msgstr "Ψευδώνυμο"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Κωδικός"
@@ -624,11 +624,11 @@ msgstr "Îα επιτÏαπεί"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr ""
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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 ""
@@ -1499,7 +1499,7 @@ msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1732,13 +1732,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1876,7 +1876,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 +2262,39 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ήδη συνδεδεμένος."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Λάθος όνομα χÏήστη ή κωδικός"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ΣÏνδεση"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Αυτόματη σÏνδεση στο μέλλον. ΟΧΙ για κοινόχÏηστους υπολογιστές!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2302,12 +2302,12 @@ msgstr ""
"Για λόγους ασφαλείας, παÏακαλώ εισάγετε ξανά το όνομα χÏήστη και τον κωδικό "
"σας, Ï€Ïιν αλλάξετε τις Ïυθμίσεις σας."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "ΣÏνδεση με όνομα χÏήστη και κωδικό"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2508,31 +2508,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2642,7 +2642,7 @@ msgid "6 or more characters"
msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Επιβεβαίωση"
@@ -2654,11 +2654,11 @@ msgstr ""
msgid "Change"
msgstr "Αλλαγή"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Οι κωδικοί δεν ταυτίζονται."
@@ -2886,44 +2886,44 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 μικÏά γÏάμματα ή αÏιθμοί, χωÏίς σημεία στίξης ή κενά"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Ονοματεπώνυμο"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ΑÏχική σελίδα"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "ΠεÏιέγÏαψε τον εαυτό σου και τα ενδιαφέÏοντά σου σε 140 χαÏακτήÏες"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "ΠεÏιέγÏαψε τον εαυτό σου και τα ενδιαφέÏοντά σου σε 140 χαÏακτήÏες"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ΒιογÏαφικό"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Τοποθεσία"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2966,7 +2966,7 @@ msgstr ""
"Αυτόματα γίνε συνδÏομητής σε όσους γίνονται συνδÏομητές σε μένα (χÏήση "
"κυÏίως από λογισμικό και όχι ανθÏώπους)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογÏαφικό είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 140 χαÏακτ.)."
@@ -3215,7 +3215,7 @@ msgstr "Ο κωδικός Ï€Ïέπει να είναι 6 χαÏακτήÏες ή
msgid "Password and confirmation do not match."
msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3223,71 +3223,93 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php: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, "
@@ -3296,7 +3318,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 "
@@ -3330,7 +3352,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.)"
@@ -3411,7 +3433,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 "ΔημιουÏγία"
@@ -3482,7 +3504,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 "Η κατάσταση διαγÏάφεται."
@@ -3541,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"
@@ -3554,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
msgid "Description"
msgstr "ΠεÏιγÏαφή"
@@ -4495,7 +4517,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4617,29 +4639,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 "
@@ -4647,7 +4669,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 "
@@ -4655,40 +4677,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:779
#, 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 ""
@@ -4731,45 +4753,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5382,12 +5404,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 "Ο κωδικός αποθηκεÏτηκε."
@@ -5480,14 +5502,14 @@ msgstr "Ονοματεπώνυμο"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5971,8 +5993,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5988,7 +6017,7 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -5996,13 +6025,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6016,30 +6045,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Κατάσταση του/της %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νοÏμεÏο τηλεφώνου."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6056,13 +6085,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6082,13 +6111,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6110,7 +6139,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6118,13 +6147,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6161,7 +6190,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 "από"
@@ -6318,23 +6347,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"
@@ -6446,7 +6475,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6470,7 +6499,7 @@ msgstr "ΠÏοτεινόμενα"
msgid "Popular"
msgstr "Δημοφιλή"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6493,7 +6522,7 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6676,56 +6705,56 @@ msgid "Moderator"
msgstr "Συντονιστής"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index bb3c577b6..83e88c353 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:42+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:23+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -85,24 +86,24 @@ 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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "No such page."
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 +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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s and friends, page %2$d"
@@ -123,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -166,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -175,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,14 +186,14 @@ msgstr ""
"post a notice to his or her attention."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -203,22 +204,22 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -227,12 +228,12 @@ msgstr "API method not found."
#: 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:209
+#: 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."
@@ -266,7 +267,7 @@ msgstr "Couldn't save profile."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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,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:114
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."
@@ -392,119 +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
+#: actions/apigroupcreate.php:267
#, php-format
msgid "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
+#: 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."
-#: 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
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$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"
@@ -519,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
@@ -597,8 +598,8 @@ msgstr ""
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -606,8 +607,8 @@ msgid "Nickname"
msgstr "Nickname"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Password"
@@ -623,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:108
msgid "This method requires a POST or DELETE."
msgstr "This method requires a POST or DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "You may not delete another user's status."
@@ -644,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Not found."
-#: actions/apistatusesupdate.php:316 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."
@@ -671,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:196 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:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates from everyone!"
@@ -711,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!"
@@ -773,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"
@@ -813,11 +814,11 @@ msgstr "Avatar deleted."
msgid "You already blocked that user."
msgstr "You already blocked that user."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Block user"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -832,7 +833,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -841,7 +842,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Do not block this user"
@@ -850,7 +851,7 @@ msgstr "Do not block this user"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -858,11 +859,11 @@ msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Failed to save block information."
@@ -1023,7 +1024,7 @@ msgstr "Delete this application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Not logged in."
@@ -1054,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"
@@ -1472,7 +1473,7 @@ msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
@@ -1686,7 +1687,7 @@ 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
msgid "You cannot grant user roles on this site."
@@ -1698,13 +1699,13 @@ msgstr "User already has this role."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No profile specified."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No profile with that ID."
@@ -1844,7 +1845,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"
@@ -1908,6 +1909,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
@@ -1915,10 +1918,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."
@@ -2262,39 +2267,39 @@ msgstr "You are not a member of that group."
msgid "%1$s left group %2$s"
msgstr "%1$s left group %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Already logged in."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Incorrect username or password."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Error setting user. You are probably not authorised."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Lost or forgotten password?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2302,22 +2307,20 @@ msgstr ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
-#: actions/login.php:270
-#, fuzzy
+#: actions/login.php:292
msgid "Login with your username and password."
-msgstr "Login with a username and password"
+msgstr "Login with your username and password."
-#: actions/login.php:273
-#, fuzzy, php-format
+#: actions/login.php:295
+#, php-format
msgid ""
"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
@@ -2480,16 +2483,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."
@@ -2512,30 +2515,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
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "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
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2638,7 +2641,7 @@ msgid "6 or more characters"
msgstr "6 or more characters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirm"
@@ -2650,11 +2653,11 @@ msgstr "Same as password above"
msgid "Change"
msgstr "Change"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Password must be 6 or more characters."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passwords don't match."
@@ -2877,43 +2880,43 @@ msgstr "Profile information"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Full name"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL of your homepage, blog, or profile on another site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Describe yourself and your interests in %d chars"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Describe yourself and your interests"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Location"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Where you are, like \"City, State (or Region), Country\""
@@ -2955,7 +2958,7 @@ msgid ""
msgstr ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max %d chars)."
@@ -3210,7 +3213,7 @@ msgstr "Password must be 6 chars or more."
msgid "Password and confirmation do not match."
msgstr "Password and confirmation do not match."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error setting user."
@@ -3218,71 +3221,93 @@ msgstr "Error setting user."
msgid "New password successfully saved. You are now logged in."
msgstr "New password successfully saved. You are now logged in."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Sorry, only invited people can register."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Sorry, invalid invitation code."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php: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
+#: 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, "
@@ -3291,7 +3316,7 @@ msgstr ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3324,7 +3349,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.)"
@@ -3404,7 +3429,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"
@@ -3476,7 +3501,7 @@ msgstr "You cannot revoke user roles on this site."
msgid "User doesn't have this role."
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"
@@ -3533,7 +3558,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"
@@ -3544,7 +3569,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"
@@ -4253,6 +4278,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
@@ -4490,7 +4517,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"
@@ -4619,29 +4646,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 "
@@ -4653,7 +4680,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 "
@@ -4665,7 +4692,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 "
@@ -4674,32 +4701,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:779
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 ""
@@ -4738,26 +4765,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
+#: classes/Notice.php:182
#, php-format
msgid "Database 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."
@@ -4765,21 +4792,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5117,7 +5144,7 @@ msgstr ""
#: lib/action.php:871
#, 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
@@ -5367,11 +5394,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"
@@ -5462,14 +5489,14 @@ msgstr "Fullname: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Location: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -5665,6 +5692,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. "
@@ -5700,7 +5765,7 @@ msgstr "Connections"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Authorised connected applications"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -5947,8 +6012,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s is now listening to your notices on %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5974,19 +6046,19 @@ msgstr ""
"Change your email address or notification options at %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "New e-mail address for posting to %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6008,30 +6080,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS confirmation"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirm you own this phone number with this code:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "You've been nudged by %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6048,13 +6120,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "New private message from %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6074,13 +6146,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) added your notice as a favorite"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6102,7 +6174,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6110,13 +6182,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6153,7 +6225,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"
@@ -6307,23 +6379,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"
@@ -6433,7 +6505,7 @@ msgstr ""
msgid "All groups"
msgstr "All groups"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6457,7 +6529,7 @@ msgstr "Featured"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No return-to arguments."
@@ -6478,7 +6550,7 @@ msgstr "Repeat this notice"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoke the \"%s\" role from this user"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6627,7 +6699,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"
@@ -6639,7 +6711,7 @@ msgstr "Message"
#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "Moderate"
#: lib/userprofile.php:364
msgid "User role"
@@ -6653,59 +6725,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:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "a few seconds ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "about a minute ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "about an hour ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "about a day ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "about a month ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 7147c728f..79d8a9e08 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:46+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:27+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -89,24 +89,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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "No existe ese usuario."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s y sus amistades, página %2$d"
@@ -127,33 +127,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -161,7 +161,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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -171,7 +171,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -180,7 +180,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -190,14 +190,14 @@ msgstr ""
"toque a %s o publicar algo a su atención?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -208,22 +208,22 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -232,12 +232,12 @@ msgstr "Método de API no encontrado."
#: 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:209
+#: 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."
@@ -269,7 +269,7 @@ msgstr "No se pudo guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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,41 +328,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:114
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."
@@ -395,121 +395,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"
@@ -524,15 +524,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
@@ -605,8 +605,8 @@ msgstr ""
msgid "Account"
msgstr "Cuenta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -614,8 +614,8 @@ msgid "Nickname"
msgstr "Usuario"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contraseña"
@@ -631,11 +631,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:108
msgid "This method requires a POST or DELETE."
msgstr "Este método requiere un PUBLICAR O ELIMINAR"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "No puedes borrar el estado de otro usuario."
@@ -652,25 +652,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "No encontrado."
-#: actions/apistatusesupdate.php:316 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 ""
@@ -681,32 +681,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:196 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:201 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!"
@@ -721,12 +721,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!"
@@ -783,7 +783,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"
@@ -823,11 +823,11 @@ msgstr "Imagen borrada."
msgid "You already blocked that user."
msgstr "Ya has bloqueado a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -842,7 +842,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -851,7 +851,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquear a este usuario"
@@ -860,7 +860,7 @@ msgstr "No bloquear a este usuario"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -868,11 +868,11 @@ msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
@@ -1034,7 +1034,7 @@ msgstr "Borrar esta aplicación"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "No conectado."
@@ -1065,7 +1065,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"
@@ -1486,7 +1486,7 @@ msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
@@ -1714,13 +1714,13 @@ msgstr "El usuario ya tiene esta función."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No se especificó perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No existe perfil con ese ID"
@@ -1863,7 +1863,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"
@@ -2289,41 +2289,41 @@ msgstr "No eres miembro de este grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha dejado el grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ya estás conectado."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
"compartidos! "
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "¿Contraseña olvidada o perdida?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2331,11 +2331,11 @@ msgstr ""
"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
"contraseña antes de cambiar tu configuración."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Ingresar con tu nombre de usuario y contraseña."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2545,30 +2545,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -2672,7 +2672,7 @@ msgid "6 or more characters"
msgstr "6 o más caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2684,11 +2684,11 @@ msgstr "Igual a la contraseña de arriba"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Cotrnaseña debe tener 6 o más caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Las contraseñas no coinciden"
@@ -2915,43 +2915,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nombre completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página de inicio"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descríbete y cuéntanos tus intereses en %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descríbete y cuéntanos acerca de tus intereses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografía"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicación"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
@@ -2995,7 +2995,7 @@ msgstr ""
"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
"para no-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografía es muy larga (máx. %d caracteres)."
@@ -3264,7 +3264,7 @@ msgstr "La contraseña debe tener 6 o más caracteres."
msgid "Password and confirmation do not match."
msgstr "La contraseña y la confirmación no coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error al configurar el usuario."
@@ -3272,39 +3272,39 @@ msgstr "Error al configurar el usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Disculpa, sólo personas invitadas pueden registrarse."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "El código de invitación no es válido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php: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. "
@@ -3312,36 +3312,60 @@ msgstr ""
"Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
"avisos y enviar vínculos de ellos a tus amigos y colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
"Requerido."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o más caracters. Requerido."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
-#: actions/register.php: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, "
@@ -3351,7 +3375,7 @@ msgstr ""
"información privada: contraseña, dirección de correo electrónico, dirección "
"de mensajería instantánea y número de teléfono."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3384,7 +3408,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.)"
@@ -3467,7 +3491,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"
@@ -3541,7 +3565,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"
@@ -3598,7 +3622,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"
@@ -3609,7 +3633,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"
@@ -4588,7 +4612,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"
@@ -4717,18 +4741,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, "
@@ -4737,11 +4761,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 "
@@ -4753,7 +4777,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 "
@@ -4765,7 +4789,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 "
@@ -4774,20 +4798,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:779
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 "
@@ -4796,13 +4820,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."
@@ -4841,27 +4865,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."
@@ -4869,21 +4893,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5053,7 +5077,7 @@ msgstr "Cerrar sesión en el sitio"
#: lib/action.php:467
msgctxt "MENU"
msgid "Logout"
-msgstr "Cerrar Sesión"
+msgstr "Cerrar sesión"
#. TRANS: Tooltip for main menu option "Register"
#: lib/action.php:472
@@ -5481,11 +5505,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"
@@ -5580,14 +5604,14 @@ msgstr "Nombre completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Lugar: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Página de inicio: %s"
@@ -6124,8 +6148,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"
@@ -6153,19 +6187,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"
@@ -6187,30 +6221,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 "
@@ -6238,13 +6272,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"
@@ -6278,13 +6312,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"
@@ -6322,7 +6356,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"
@@ -6333,13 +6367,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"
@@ -6402,7 +6436,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"
@@ -6563,23 +6597,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"
@@ -6689,7 +6723,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."
@@ -6713,7 +6747,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."
@@ -6734,7 +6768,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."
@@ -6912,56 +6946,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "hace unos segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "hace un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "hace una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "hace un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "hace un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 77e38b3a8..b9a01991b 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: ArianHT
# Author@translatewiki.net: Everplays
+# Author@translatewiki.net: Huji
# Author@translatewiki.net: Narcissus
# --
# This file is distributed under the same license as the StatusNet package.
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:52+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:34+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s کاربران مسدود شده، صÙحه‌ی %d"
@@ -126,39 +127,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -177,7 +178,7 @@ msgstr ""
"می‌توانید از صÙحه‌ی شخصی‌اش به او [سقلمه](../%2$s) بزنید یا [چیزی بنویسید](%%%%"
"action.newnotice%%%%?status_textarea=%3$s) تا توجه او را جذب کنید."
-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,14 +188,14 @@ msgstr ""
"را جلب کنید."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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$"
@@ -205,22 +206,22 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 "رابط مورد نظر پیدا نشد."
@@ -229,12 +230,12 @@ msgstr "رابط مورد نظر پیدا نشد."
#: 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:209
+#: 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 "برای استÙاده از این روش باید اطلاعات را به صورت پست بÙرستید"
@@ -265,7 +266,7 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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,41 +324,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:114
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 "نمی‌توان وضعیت موردعلاقه را حذ٠کرد."
@@ -390,120 +391,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 "نام کامل طولانی است (۲۵۵ حر٠در حالت بیشینه(."
-#: 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 "مکان طولانی است (حداکثر Û²ÛµÛµ حرÙ)"
-#: 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 "عضویت %s در گروه %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"
@@ -519,15 +520,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
@@ -593,8 +594,8 @@ msgstr ""
msgid "Account"
msgstr "حساب کاربری"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -602,8 +603,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 "گذرواژه"
@@ -621,11 +622,11 @@ msgstr "همه"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "این روش نیازمند POST یا DELETE است."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "شما توانایی حذ٠وضعیت کاربر دیگری را ندارید."
@@ -642,25 +643,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "یاÙت نشد."
-#: actions/apistatusesupdate.php:316 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 حر٠است که شامل ضمیمه نیز می‌باشد"
@@ -669,32 +670,32 @@ msgstr "حداکثر طول پیام %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
#, 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s خط‌زمانی عمومی"
-#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s به روز رسانی های عموم"
@@ -709,12 +710,12 @@ msgstr ""
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"
@@ -773,7 +774,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 "حذÙ"
@@ -814,11 +815,11 @@ msgstr "چهره پاک شد."
msgid "You already blocked that user."
msgstr "شما هم اکنون آن کاربر را مسدود کرده اید."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "مسدود کردن کاربر"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -834,7 +835,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 +845,7 @@ msgstr "خیر"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "کاربر را مسدود نکن"
@@ -853,7 +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
@@ -862,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 ""
@@ -1034,7 +1035,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 +1066,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 "این پیام را پاک کن"
@@ -1395,10 +1396,9 @@ 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 "انصراÙ"
+msgstr "لغو"
#. TRANS: Instructions for e-mail address input form.
#: actions/emailsettings.php:135
@@ -1500,7 +1500,7 @@ msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "یک آدرس ایمیل معتبر نیست."
@@ -1732,13 +1732,13 @@ msgstr "کاربر قبلا ساکت شده است."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "کاربری مشخص نشده است."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
@@ -1872,7 +1872,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"
@@ -2273,39 +2273,39 @@ msgstr "شما یک کاربر این گروه نیستید."
msgid "%1$s left group %2$s"
msgstr "%s گروه %s را ترک کرد."
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "قبلا وارد شده"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "نام کاربری یا رمز عبور نادرست."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ورود"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "ورود به وب‌گاه"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "مرا به یاد بسپار"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "رمز عبور خود را Ú¯Ù… یا Ùراموش کرده اید؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2313,12 +2313,12 @@ msgstr ""
"به دلایل امنیتی، لطÙا نام کاربری Ùˆ رمز عبور خود را قبل از تغییر تنظیمات "
"دوباره وارد نمایید."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2531,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -2665,7 +2665,7 @@ msgid "6 or more characters"
msgstr "۶ نویسه یا بیش‌تر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "تایید"
@@ -2677,11 +2677,11 @@ msgstr "مثل رمز عبور بالا"
msgid "Change"
msgstr "تغییر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "گذرواژه‌ها مطابقت ندارند."
@@ -2907,43 +2907,43 @@ msgstr "اطلاعات شناس‌نامه"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "Û±-Û¶Û´ کاراکتر Ú©ÙˆÚ†Ú© یا اعداد، بدون نقطه گذاری یا Ùاصله"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "نام‌کامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "صÙحهٔ خانگی"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "نشانی اینترنتی صÙحهٔ خانگی، وبلاگ یا مشخصات کاربری‌تان در یک وب‌گاه دیگر"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "خودتان و علایقتان را توصی٠کنید."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "شرح‌حال"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "موقعیت"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2983,7 +2983,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3231,7 +3231,7 @@ msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد
msgid "Password and confirmation do not match."
msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3239,71 +3239,93 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr "کلمه ÛŒ عبور جدید با موÙقیت ذخیره شد. شما الان وارد شده اید."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "با عرض معذرت، تنها اÙراد دعوت شده Ù…ÛŒ توانند ثبت نام کنند."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "با عرض تاسÙØŒ کد دعوت نا معتبر است."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "ثبت نام با موÙقیت انجام شد."
-#: actions/register.php:114 actions/register.php: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, "
@@ -3312,7 +3334,7 @@ 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 "
@@ -3331,7 +3353,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.)"
@@ -3408,7 +3430,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 ""
@@ -3480,7 +3502,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 "وضعیت حذ٠شد."
@@ -3541,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"
@@ -3554,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
msgid "Description"
msgstr ""
@@ -4498,7 +4520,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "لیسانس"
@@ -4619,29 +4641,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
#, 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 "
@@ -4649,7 +4671,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 "
@@ -4657,41 +4679,41 @@ 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:779
#, fuzzy
msgid "Version"
msgstr "شخصی"
-#: actions/version.php:197
+#: actions/version.php:199
#, fuzzy
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 ""
@@ -4732,27 +4754,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 ""
-#: 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."
@@ -4760,22 +4782,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5338,7 +5360,7 @@ msgstr ""
#. TRANS: Submit button title
#: lib/applicationeditform.php:359
msgid "Cancel"
-msgstr "انصراÙ"
+msgstr "لغو"
#. TRANS: Application access type
#: lib/applicationlist.php:136
@@ -5386,12 +5408,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 "تغییر گذرواژه"
@@ -5486,14 +5508,14 @@ msgstr "نام کامل : %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "موقعیت : %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "صÙحه خانگی : %s"
@@ -5973,8 +5995,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%2$s از حالا به خبر های شما گوش میده %1$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5990,19 +6019,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "موقعیت : %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ادرس ایمیل جدید برای"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6022,30 +6051,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "وضعیت %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "تایید پیامک"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "منتظر تاییدیه برای این شماره تلÙÙ†."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6062,13 +6091,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6088,13 +6117,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr " خبر شما را به علایق خود اضاÙÙ‡ کرد %s (@%s)"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6116,7 +6145,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6124,13 +6153,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "به توجه شما یک خبر Ùرستاده شده %s (@%s)"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6167,7 +6196,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 "از"
@@ -6326,23 +6355,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 "آگهی تکرار شد"
@@ -6452,7 +6481,7 @@ msgstr ""
msgid "All groups"
msgstr "تمام گروه‌ها"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6476,7 +6505,7 @@ msgstr "خصوصیت"
msgid "Popular"
msgstr "محبوب"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6498,7 +6527,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر را به گروه مسدود کن"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6677,56 +6706,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index a09c1415d..058a0816d 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:49+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01: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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -93,25 +93,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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 +124,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:87
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s ja kaverit, sivu %d"
@@ -132,33 +132,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -166,7 +166,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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -176,7 +176,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:143
#, fuzzy, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -185,7 +185,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -193,14 +193,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -211,22 +211,22 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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!"
@@ -236,12 +236,12 @@ msgstr "API-metodia ei löytynyt!"
#: 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:209
+#: 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."
@@ -273,7 +273,7 @@ msgstr "Ei voitu tallentaa profiilia."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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 +333,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:114
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 +406,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 +537,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
@@ -615,8 +615,8 @@ msgstr ""
msgid "Account"
msgstr "Käyttäjätili"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -624,8 +624,8 @@ msgid "Nickname"
msgstr "Tunnus"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Salasana"
@@ -643,11 +643,11 @@ msgstr "Kaikki"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
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:131
msgid "You may not delete another user's status."
msgstr "Et voi poistaa toisen käyttäjän päivitystä."
@@ -666,25 +666,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ei löytynyt."
-#: actions/apistatusesupdate.php:316 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 +693,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:196 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:201 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 +734,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 +797,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 +839,11 @@ msgstr "Kuva poistettu."
msgid "You already blocked that user."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Estä käyttäjä"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -855,7 +855,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -865,7 +865,7 @@ msgstr "Ei"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
@@ -874,7 +874,7 @@ msgstr "Älä estä tätä käyttäjää"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -883,11 +883,11 @@ msgid "Yes"
msgstr "Kyllä"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
@@ -1053,7 +1053,7 @@ msgstr "Poista tämä päivitys"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Et ole kirjautunut sisään."
@@ -1084,7 +1084,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"
@@ -1531,7 +1531,7 @@ msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -1767,13 +1767,13 @@ msgstr "Käyttäjä on asettanut eston sinulle."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Profiilia ei ole määritelty."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ei profiilia tuolle ID:lle."
@@ -1910,7 +1910,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 +2338,42 @@ msgstr "Sinä et kuulu tähän ryhmään."
msgid "%1$s left group %2$s"
msgstr "%s erosi ryhmästä %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Olet jo kirjautunut sisään."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Väärä käyttäjätunnus tai salasana"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
"useampi käyttäjä!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Oletko hukannut tai unohtanut salasanasi?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2381,12 +2381,12 @@ msgstr ""
"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
"asetuksiesi muuttamista."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2599,31 +2599,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -2733,7 +2733,7 @@ msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Vahvista"
@@ -2745,11 +2745,11 @@ msgstr "Sama kuin ylläoleva salasana"
msgid "Change"
msgstr "Vaihda"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Salasanat eivät täsmää."
@@ -2990,43 +2990,43 @@ msgstr ""
"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
"välilyöntejä"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Koko nimi"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Kotisivu"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Tietoja"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Kotipaikka"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -3070,7 +3070,7 @@ msgstr ""
"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
"ihmiskäyttäjille)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
@@ -3322,7 +3322,7 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
msgid "Password and confirmation do not match."
msgstr "Salasana ja salasanan vahvistus eivät täsmää."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
@@ -3331,75 +3331,97 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Virheellinen kutsukoodin."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php: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, "
@@ -3408,7 +3430,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 "
@@ -3441,7 +3463,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.)"
@@ -3530,7 +3552,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"
@@ -3606,7 +3628,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."
@@ -3670,7 +3692,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"
@@ -3683,7 +3705,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"
@@ -4660,7 +4682,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"
@@ -4790,29 +4812,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 "
@@ -4820,7 +4842,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 "
@@ -4828,40 +4850,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:779
#, 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 ""
@@ -4905,28 +4927,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."
@@ -4934,22 +4956,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5583,12 +5605,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"
@@ -5681,14 +5703,14 @@ msgstr "Koko nimi: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Kotipaikka: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Kotisivu: %s"
@@ -6182,8 +6204,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6209,7 +6238,7 @@ msgstr ""
"Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6217,13 +6246,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6245,30 +6274,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s päivitys"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS vahvistus"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s tönäisi sinua"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6285,13 +6314,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Uusi yksityisviesti käyttäjältä %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6311,13 +6340,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s lisäsi päivityksesi suosikkeihinsa"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6339,7 +6368,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6347,13 +6376,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6390,7 +6419,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ä "
@@ -6550,25 +6579,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."
@@ -6682,7 +6711,7 @@ msgstr ""
msgid "All groups"
msgstr "Kaikki ryhmät"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6706,7 +6735,7 @@ msgstr "Esittelyssä"
msgid "Popular"
msgstr "Suosituimmat"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Ei id parametria."
@@ -6730,7 +6759,7 @@ msgstr "Vastaa tähän päivitykseen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6920,56 +6949,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "noin minuutti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "noin tunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "noin päivä sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "noin kuukausi sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index cf3f5d3b5..cc2f510ea 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:17:56+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:38+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -90,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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "Utilisateur non trouvé."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s et ses amis, page %2$d"
@@ -128,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -162,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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -172,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -182,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -192,14 +192,14 @@ msgstr ""
"un clin d’œil à %s ou poster un avis à son intention."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -210,22 +210,22 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 !"
@@ -234,12 +234,12 @@ msgstr "Méthode API non trouvée !"
#: 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:209
+#: 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."
@@ -271,7 +271,7 @@ msgstr "Impossible d’enregistrer le profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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
@@ -330,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:114
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."
@@ -399,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"
@@ -528,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
@@ -613,8 +613,8 @@ msgstr ""
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -622,8 +622,8 @@ msgid "Nickname"
msgstr "Pseudo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Mot de passe"
@@ -639,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:108
msgid "This method requires a POST or DELETE."
msgstr "Ce processus requiert un POST ou un DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
@@ -660,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trouvé."
-#: actions/apistatusesupdate.php:316 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 "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:196 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:201 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 !"
@@ -729,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 !"
@@ -793,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"
@@ -833,11 +833,11 @@ msgstr "Avatar supprimé."
msgid "You already blocked that user."
msgstr "Vous avez déjà bloqué cet utilisateur."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -852,7 +852,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -861,7 +861,7 @@ msgstr "Non"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
@@ -870,7 +870,7 @@ msgstr "Ne pas bloquer cet utilisateur"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -878,11 +878,11 @@ msgid "Yes"
msgstr "Oui"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
@@ -1043,7 +1043,7 @@ msgstr "Supprimer cette application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non connecté."
@@ -1074,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"
@@ -1494,7 +1494,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
@@ -1721,13 +1721,13 @@ msgstr "L’utilisateur a déjà ce rôle."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Aucun profil n’a été spécifié."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Aucun profil ne correspond à cet identifiant."
@@ -1869,7 +1869,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"
@@ -2304,43 +2304,43 @@ msgstr "Vous n’êtes pas membre de ce groupe."
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Déjà connecté."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
"pas autorisé."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
"ordinateurs publics ou partagés)"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mot de passe perdu ?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2348,11 +2348,11 @@ msgstr ""
"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
"votre mot de passe afin d’enregistrer vos préférences."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Ouvrez une session avec un identifiant et un mot de passe."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2565,30 +2565,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -2692,7 +2692,7 @@ msgid "6 or more characters"
msgstr "6 caractères ou plus"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmer"
@@ -2704,11 +2704,11 @@ msgstr "Identique au mot de passe ci-dessus"
msgid "Change"
msgstr "Modifier"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Votre mot de passe doit contenir au moins 6 caractères."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Les mots de passe ne correspondent pas."
@@ -2935,43 +2935,43 @@ msgstr "Information de profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site personnel"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Décrivez vous et vos intérêts en %d caractères"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Décrivez vous et vos interêts"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Emplacement"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
@@ -3015,7 +3015,7 @@ msgstr ""
"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
"les utilisateurs non-humains)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
@@ -3280,7 +3280,7 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères."
msgid "Password and confirmation do not match."
msgstr "Le mot de passe et sa confirmation ne correspondent pas."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
@@ -3289,39 +3289,39 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Désolé, code d’invitation invalide."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3329,36 +3329,60 @@ msgstr ""
"Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
"poster des avis and et vous relier à des amis et collègues. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 caractères ou plus. Requis."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Courriel"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilisé uniquement pour les mises à jour, les notifications, et la "
"récupération de mot de passe"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom plus long, votre \"vrai\" nom de préférence"
-#: actions/register.php: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, "
@@ -3368,7 +3392,7 @@ msgstr ""
"données personnelles : mot de passe, adresse électronique, adresse de "
"messagerie instantanée, numéro de téléphone."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3402,7 +3426,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.)"
@@ -3484,7 +3508,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"
@@ -3560,7 +3584,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"
@@ -3618,7 +3642,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"
@@ -3629,7 +3653,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"
@@ -4616,7 +4640,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"
@@ -4748,18 +4772,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, "
@@ -4768,11 +4792,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 "
@@ -4784,7 +4808,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 "
@@ -4796,7 +4820,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 "
@@ -4805,20 +4829,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:779
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 "
@@ -4827,12 +4851,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."
@@ -4871,27 +4895,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."
@@ -4899,21 +4923,21 @@ 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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5509,11 +5533,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"
@@ -5607,14 +5631,14 @@ msgstr "Nom complet : %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Emplacement : %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Site Web : %s"
@@ -6158,8 +6182,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s suit maintenant vos avis sur %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6185,19 +6216,19 @@ msgstr ""
"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio : %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nouvelle adresse courriel pour poster dans %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6219,31 +6250,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Statut de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s : confirmez que vous possédez ce numéro de téléphone grâce à ce code :"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Vous avez reçu un clin d’œil de %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6271,13 +6302,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nouveau message personnel de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6311,13 +6342,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) a ajouté un de vos avis à ses favoris"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6356,7 +6387,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6367,13 +6398,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) vous a envoyé un avis"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6436,7 +6467,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"
@@ -6596,23 +6627,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"
@@ -6722,7 +6753,7 @@ msgstr "Moyenne journalière"
msgid "All groups"
msgstr "Tous les groupes"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Méthode non implémentée."
@@ -6746,7 +6777,7 @@ msgstr "En vedette"
msgid "Popular"
msgstr "Populaires"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Aucun argument de retour."
@@ -6767,7 +6798,7 @@ msgstr "Reprendre cet avis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Révoquer le rôle « %s » de cet utilisateur"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
@@ -6945,56 +6976,56 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "il y a 1 minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "il y a 1 heure"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "il y a 1 jour"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "il y a 1 mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 6fd558045..0965203b5 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:04+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:42+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -186,15 +186,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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!"
@@ -205,22 +205,22 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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"
@@ -230,12 +230,12 @@ msgstr "Método da API non atopado"
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -610,8 +610,8 @@ msgstr ""
msgid "Account"
msgstr "Sobre"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +619,8 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasinal"
@@ -637,11 +637,11 @@ msgstr "Todos"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Este método require un POST ou DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:316 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:196 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:201 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."
@@ -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"
@@ -1551,7 +1551,7 @@ msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
@@ -1789,13 +1789,13 @@ msgstr "O usuario bloqueoute."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Non se especificou ningún perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Non se atopou un perfil con ese ID."
@@ -1942,7 +1942,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 +2370,40 @@ msgstr "Non estás suscrito a ese perfil"
msgid "%1$s left group %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sesión xa iniciada"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Usuario ou contrasinal incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrarme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "¿Perdeches a contrasinal?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2411,12 +2411,12 @@ msgstr ""
"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
"contrasinal antes de cambiar as túas preferenzas."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Accede co teu nome de usuario e contrasinal."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2628,31 +2628,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -2764,7 +2764,7 @@ msgid "6 or more characters"
msgstr "6 ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2776,11 +2776,11 @@ msgstr "Igual que a contrasinal de enriba"
msgid "Change"
msgstr "Modificado"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "A contrasinal debe ter 6 caracteres ou máis."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "As contrasinais non coinciden"
@@ -3019,44 +3019,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localización"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
@@ -3100,7 +3100,7 @@ msgstr ""
"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
"non humáns)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
@@ -3359,7 +3359,7 @@ msgstr "A contrasinal debe ter 6 caracteres ou máis."
msgid "Password and confirmation do not match."
msgstr "A contrasinal e a súa confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Acounteceu un erro configurando o usuario."
@@ -3367,40 +3367,40 @@ msgstr "Acounteceu un erro configurando o usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpa, só se pode rexistrar a xente con invitación."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Acounteceu un erro co código de confirmación."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3410,36 +3410,58 @@ msgstr ""
"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
"puntuación. Requerido."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Requerido."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo Electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
-#: actions/register.php: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, "
@@ -3448,7 +3470,7 @@ msgstr ""
" agás esta informción privada: contrasinal, dirección de correo electrónico, "
"dirección IM, número de teléfono."
-#: actions/register.php:542
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3480,7 +3502,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.)"
@@ -3569,7 +3591,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"
@@ -3641,7 +3663,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."
@@ -3704,7 +3726,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"
@@ -3717,7 +3739,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"
@@ -4712,7 +4734,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 ""
@@ -4844,29 +4866,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 "
@@ -4874,7 +4896,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 +4904,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:779
#, 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 ""
@@ -4959,28 +4981,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 "
@@ -4989,22 +5011,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5642,12 +5664,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."
@@ -5744,14 +5766,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Ubicación: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Páxina persoal: %s"
@@ -6301,8 +6323,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está a escoitar os teus chíos %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6324,19 +6353,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Ubicación: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nova dirección de email para posterar en %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6358,30 +6387,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmación de SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Agardando a confirmación neste número de teléfono."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s douche un toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6408,13 +6437,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s enviouche unha nova mensaxe privada"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6448,13 +6477,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s gustoulle o teu chío"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6488,7 +6517,7 @@ msgstr ""
"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6496,13 +6525,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6539,7 +6568,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 "
@@ -6702,27 +6731,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"
@@ -6841,7 +6870,7 @@ msgstr ""
msgid "All groups"
msgstr "Tódalas etiquetas"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6866,7 +6895,7 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Non hai argumento id."
@@ -6890,7 +6919,7 @@ msgstr "Non se pode eliminar este chíos."
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -7087,56 +7116,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fai un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fai unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fai un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fai un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 0b59b9adb..8ec9859f7 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-29 23:21+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:08+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:46+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,14 +185,14 @@ msgstr ""
"un aceno a %s ou publicar unha nota dirixida a el ou ela?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -203,22 +203,22 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -227,12 +227,12 @@ msgstr "Non se atopou o método da API."
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -601,8 +601,8 @@ msgstr ""
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasinal"
@@ -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:108
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:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non se atopou."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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."
@@ -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"
@@ -1487,7 +1487,7 @@ msgid "Cannot normalize that email address"
msgstr "Non se pode normalizar ese enderezo de correo electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "O enderezo de correo electrónico é incorrecto."
@@ -1713,13 +1713,13 @@ msgstr "O usuario xa ten este rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Non se especificou ningún perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ningún perfil ten esa ID."
@@ -1860,7 +1860,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 +2231,8 @@ msgid ""
msgstr ""
"%1$s convidouno a unirse a el en %2$s (%3$s).\n"
"\n"
-"%2$s é un servizo de microblogue que lle permite estar ao día coas persoas "
-"que coñece e coas que lle interesen.\n"
+"%2$s é un servizo de mensaxes de blogue curtas que lle permite estar ao día "
+"coas persoas que coñece e coas que lle interesen.\n"
"\n"
"Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con "
"outros coñecidos. Tamén está moi ben para coñecer xente con intereses "
@@ -2285,43 +2285,43 @@ msgstr "Non pertence a ese grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Xa se identificou."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de usuario ou contrasinal incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
"para facelo."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Identificarse"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Identificarse no sitio"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrádeme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Identificarse automaticamente no futuro. Non se aconsella en computadoras "
"compartidas!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Esqueceu ou perdeu o contrasinal?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2329,11 +2329,11 @@ msgstr ""
"Por razóns de seguridade, volva introducir o seu nome de usuario e "
"contrasinal antes de cambiar a súa configuración."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Identifíquese co seu nome de usuario e contrasinal."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2541,30 +2541,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Non se soporta ese formato de datos."
@@ -2670,7 +2670,7 @@ msgid "6 or more characters"
msgstr "Seis ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2682,11 +2682,11 @@ msgstr "Igual ao contrasinal anterior"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "O contrasinal debe conter seis ou máis caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Os contrasinais non coinciden."
@@ -2913,43 +2913,43 @@ msgstr ""
"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
"espazos, tiles ou eñes"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descríbase a vostede e mailos seus intereses en %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descríbase a vostede e mailos seus intereses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografía"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Lugar"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), paísâ€"
@@ -2993,7 +2993,7 @@ msgstr ""
"Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
"bots)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "A biografía é longa de máis (o límite son %d caracteres)."
@@ -3091,11 +3091,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/"
-"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre "
-"[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para "
-"compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis "
-"información](%%doc.help%%))"
+"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en."
+"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
+"software libre [StatusNet](http://status.net/). [Únase agora](%%action."
+"register%%) para compartir notas persoais cos amigos, a familia e os "
+"compañeiros! ([Máis información](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3104,9 +3104,9 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/"
-"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre "
-"[StatusNet](http://status.net/)."
+"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en."
+"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
+"software libre [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -3261,7 +3261,7 @@ msgstr "O contrasinal debe ter seis ou máis caracteres."
msgid "Password and confirmation do not match."
msgstr "O contrasinal e a confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Houbo un erro ao configurar o usuario."
@@ -3269,39 +3269,39 @@ msgstr "Houbo un erro ao configurar o usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Só se pode rexistrar mediante invitación."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "O código da invitación é incorrecto."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rexistrouse correctamente"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3309,36 +3309,61 @@ msgstr ""
"Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
"e porse en contacto con amigos e compañeiros. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
"espazos, tiles ou eñes. Obrigatorio."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Obrigatorio."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome longo, preferiblemente o seu nome \"real\""
-#: actions/register.php: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, "
@@ -3348,7 +3373,7 @@ msgstr ""
"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
"instantánea e números de teléfono."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3380,7 +3405,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.)"
@@ -3397,8 +3422,8 @@ msgid ""
msgstr ""
"Para subscribirse, pode [identificarse](%%action.login%%) ou [rexistrar](%%"
"action.register%%) unha conta nova. Se xa ten unha conta nun [sitio de "
-"microblogging compatible](%%doc.openmublog%%), introduza a continuación o "
-"URL do seu perfil."
+"mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a "
+"continuación o URL do seu perfil."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
@@ -3422,7 +3447,8 @@ msgstr "URL do perfil"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL do seu perfil noutro servizo de microblogue compatible"
+msgstr ""
+"URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
@@ -3463,7 +3489,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"
@@ -3537,7 +3563,7 @@ msgstr "Non pode revogar os roles dos usuarios neste sitio."
msgid "User doesn't have this role."
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 "StatusNet"
@@ -3594,7 +3620,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"
@@ -3605,7 +3631,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 "Descrición"
@@ -3801,8 +3827,8 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de "
-"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
+"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo "
@@ -3816,8 +3842,8 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de "
-"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
+"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
@@ -3912,11 +3938,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]"
-"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
-"ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%"
-"%%%action.register%%%%) para seguir as notas de **%s** e de moita máis "
-"xente! ([Máis información](%%%%doc.help%%%%))"
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
+"[Únase agora](%%%%action.register%%%%) para seguir as notas de **%s** e de "
+"moita máis xente! ([Máis información](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3925,9 +3951,9 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]"
-"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
-"ferramenta de software libre [StatusNet](http://status.net/). "
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
#: actions/showstream.php:305
#, php-format
@@ -3978,7 +4004,8 @@ msgstr "Nome do sitio"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-"O nome do seu sitio, como por exemplo \"O microblogue da miña empresa\""
+"O nome do seu sitio, como por exemplo \"O sitio de mensaxes de blogue curtas "
+"da miña empresa\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -4585,7 +4612,7 @@ msgstr ""
"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 "Licenza"
@@ -4714,18 +4741,18 @@ msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse 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 "Actualizacións de %1$s en %2$s!"
-#: actions/version.php:73
+#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
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, "
@@ -4734,11 +4761,11 @@ 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 "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 "
@@ -4750,7 +4777,7 @@ msgstr ""
"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 "
@@ -4762,7 +4789,7 @@ msgstr ""
"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 "
@@ -4771,20 +4798,20 @@ 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 "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:779
msgid "Version"
msgstr "Versión"
-#: 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 "
@@ -4793,13 +4820,13 @@ 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 "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
@@ -4838,27 +4865,27 @@ msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe co novo 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 "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 "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 "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."
@@ -4866,21 +4893,21 @@ 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 "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 "Houbo un problema ao gardar a nota."
-#: classes/Notice.php:967
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "â™» @%1$s %2$s"
@@ -5168,14 +5195,14 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
-"**%%site.name%%** é un servizo de microblogue ofrecido por [%%site.broughtby%"
-"%](%%site.broughtbyurl%%)."
+"**%%site.name%%** é un servizo de mensaxes de blogue curtas ofrecido por [%%"
+"site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr "**%%site.name%%** é un servizo de microblogue."
+msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
#: lib/action.php:824
@@ -5185,9 +5212,9 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Utiliza a versión %s do software de microblogue [StatusNet](http://status."
-"net/), dispoñible baixo a [Licenza Pública Xeral Affero de GNU](http://www."
-"fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
+"Utiliza a versión %s do software de mensaxes de blogue curtas [StatusNet]"
+"(http://status.net/), dispoñible baixo a [Licenza Pública Xeral Affero de "
+"GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
#. TRANS: DT element for StatusNet site content license.
#: lib/action.php:840
@@ -5476,11 +5503,11 @@ msgstr "Notas nas que se anexou este ficheiro"
msgid "Tags for this attachment"
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 "Non se puido cambiar o contrasinal"
-#: lib/authenticationplugin.php:235
+#: lib/authenticationplugin.php:236
msgid "Password changing is not allowed"
msgstr "Non se permite cambiar o contrasinal"
@@ -5574,14 +5601,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Sitio web: %s"
@@ -6116,8 +6143,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "Agora %1$s segue as súas notas en %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6144,19 +6178,19 @@ msgstr ""
"notificación en %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografía: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo enderezo de correo electrónico para publicar en %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6178,31 +6212,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmación dos SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s: utilice o seguinte código para confirmar que o número de teléfono é seu:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s fíxolle un aceno"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6230,13 +6264,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensaxe privada de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6270,13 +6304,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) marcou a súa nota como favorita"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6315,7 +6349,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6326,13 +6360,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou unha nota á súa atención"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6394,7 +6428,7 @@ 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 "de"
@@ -6553,23 +6587,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 "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 "Repetiuse a nota"
@@ -6679,7 +6713,7 @@ msgstr "Media diaria"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Aínda non se implantou o método."
@@ -6703,7 +6737,7 @@ msgstr "Salientadas"
msgid "Popular"
msgstr "Populares"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sen argumentos \"return-to\"."
@@ -6724,7 +6758,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revogarlle o rol \"%s\" a este usuario"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
@@ -6902,56 +6936,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "hai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "hai como un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "hai como %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "hai como unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "hai como %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "hai como un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "hai como %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "hai como un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "hai como %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "hai como un ano"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 2c9927ebf..97e33ea6b 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:12+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:49+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -183,15 +183,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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 ""
@@ -202,22 +202,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 "קוד ×”×ישור ×œ× × ×ž×¦×."
@@ -227,12 +227,12 @@ msgstr "קוד ×”×ישור ×œ× × ×ž×¦×."
#: 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:209
+#: 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 ""
@@ -264,7 +264,7 @@ msgstr "שמירת הפרופיל נכשלה."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -603,8 +603,8 @@ msgstr ""
msgid "Account"
msgstr "×ודות"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -612,8 +612,8 @@ msgid "Nickname"
msgstr "כינוי"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "סיסמה"
@@ -629,11 +629,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "×œ× × ×ž×¦×"
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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 ""
@@ -1526,7 +1526,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1763,13 +1763,13 @@ msgstr "למשתמש ×ין פרופיל."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1914,7 +1914,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,51 +2311,51 @@ msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
msgid "%1$s left group %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "כבר מחובר."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "×©× ×ž×©×ª×ž×© ×ו סיסמה ×œ× × ×›×•× ×™×."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "×œ× ×ž×•×¨×©×”."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "זכור ×ותי"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "בעתיד התחבר ×וטומטית; ×œ× ×œ×©×™×ž×•×© ×‘×ž×—×©×‘×™× ×¦×™×‘×•×¨×™×™×!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "שכחת ×ו ×יבדת ×ת הסיסמה?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "לצרכי ×בטחה, הכנס מחדש ×ת ×©× ×”×ž×©×ª×ž×© והסיסמה לפני שתשנה ×ת ההגדרות."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "×©× ×”×ž×©×ª×ž×© ×ו הסיסמה ×œ× ×—×•×§×™×™×"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2560,31 +2560,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2696,7 +2696,7 @@ msgid "6 or more characters"
msgstr "לפחות 6 ×ותיות"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "×שר"
@@ -2708,11 +2708,11 @@ msgstr "זהה לסיסמה למעלה"
msgid "Change"
msgstr "שנה"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "הסיסמ×ות ×œ× ×ª×•×מות."
@@ -2947,44 +2947,44 @@ msgstr "פרופיל ×œ× ×ž×•×›×¨"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 עד 64 ×ותיות ×נגליות קטנות ×ו מספרי×, ×œ×œ× ×¡×™×ž× ×™ פיסוק ×ו רווחי×."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "×©× ×ž×œ×"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "×תר בית"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "הכתובת של ×תר הבית שלך, בלוג, ×ו פרופיל ב×תר ×חר "
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ביוגרפיה"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "מיקו×"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "מיקומך, למשל \"עיר, מדינה ×ו מחוז, ×רץ\""
@@ -3024,7 +3024,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיות)"
@@ -3274,7 +3274,7 @@ msgstr "הסיסמה חייבת להיות בת לפחות 6 ×ותיות."
msgid "Password and confirmation do not match."
msgstr "הסיסמה ו×ישורה ×ינן תו×מות."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "שגי××” ביצירת ×©× ×”×ž×©×ª×ž×©."
@@ -3282,79 +3282,101 @@ msgstr "שגי××” ביצירת ×©× ×”×ž×©×ª×ž×©."
msgid "New password successfully saved. You are now logged in."
msgstr "הסיסמה החדשה נשמרה בהצלחה. ×תה מחובר למערכת."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "שגי××” ב×ישור הקוד."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php: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 "
@@ -3373,7 +3395,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.)"
@@ -3457,7 +3479,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 "צור"
@@ -3529,7 +3551,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 "התמונה עודכנה."
@@ -3591,7 +3613,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"
@@ -3604,7 +3626,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"
@@ -4564,7 +4586,7 @@ msgstr ""
"בדוק ×ת ×”×¤×¨×˜×™× ×›×“×™ ×œ×•×•×“× ×©×‘×¨×¦×•× ×š ×œ×”×™×¨×©× ×›×ž× ×•×™ להודעות משתמש ×–×”. ×× ×ינך רוצה "
"להירש×, לחץ \"בטל\"."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4694,29 +4716,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 "
@@ -4724,7 +4746,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 "
@@ -4732,40 +4754,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:779
#, 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 ""
@@ -4808,48 +4830,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5479,12 +5501,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 "הסיסמה נשמרה."
@@ -5579,14 +5601,14 @@ msgstr "×©× ×ž×œ×"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6085,8 +6107,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s כעת מ×זין להודעות שלך ב-%2$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6107,19 +6136,19 @@ msgstr ""
" %4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "×ודות: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6133,30 +6162,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6173,13 +6202,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6199,13 +6228,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s כעת מ×זין להודעות שלך ב-%2$s"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6227,7 +6256,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6235,13 +6264,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6278,7 +6307,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 ""
@@ -6439,26 +6468,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 "הודעות"
@@ -6572,7 +6601,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6597,7 +6626,7 @@ msgstr ""
msgid "Popular"
msgstr "×נשי×"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "×ין מסמך ×›×–×”."
@@ -6621,7 +6650,7 @@ msgstr "×ין הודעה כזו."
msgid "Revoke the \"%s\" role from this user"
msgstr "×ין משתמש ×›×–×”."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6811,56 +6840,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "לפני כדקה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "לפני כשעה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "לפני כיו×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "לפני ×›-%d ימי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "לפני כחודש"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "לפני ×›-%d חודשי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index a5126d75a..d487b6085 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:15+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:55+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -85,24 +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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Strona njeeksistuje."
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "Wužiwar njeeksistuje"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s a přećeljo, strona %2$d"
@@ -123,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -163,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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -178,17 +178,17 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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
@@ -196,22 +196,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -220,12 +220,12 @@ msgstr "API-metoda njenamakana."
#: 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:209
+#: 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."
@@ -255,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:222 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
@@ -286,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
@@ -312,41 +312,41 @@ 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 ""
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:114
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 ""
-#: 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 ""
@@ -373,125 +373,125 @@ msgstr ""
#: 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
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid 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
+#: 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."
-#: 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"
@@ -506,15 +506,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
@@ -560,11 +560,11 @@ msgstr ""
#: 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
@@ -579,8 +579,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -588,8 +588,8 @@ msgid "Nickname"
msgstr "Přimjeno"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Hesło"
@@ -603,13 +603,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:108
msgid "This method requires a POST or DELETE."
msgstr "Tuta metoda wužaduje sej POST abo DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "NjemóžeÅ¡ status druheho wužiwarja zniÄić."
@@ -626,25 +626,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Njenamakany."
-#: actions/apistatusesupdate.php:316 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 ""
@@ -653,35 +653,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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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
@@ -693,12 +693,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 ""
@@ -756,7 +756,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ć"
@@ -778,7 +778,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."
@@ -786,7 +786,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."
@@ -796,11 +796,11 @@ msgstr "Awatar zniÄeny."
msgid "You already blocked that user."
msgstr "Sy tutoho wužiwarja hižo zablokował."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Wužiwarja blokować"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -812,7 +812,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -821,7 +821,7 @@ msgstr "NÄ›"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Tutoho wužiwarja njeblokować"
@@ -830,7 +830,7 @@ msgstr "Tutoho wužiwarja njeblokować"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -838,11 +838,11 @@ msgid "Yes"
msgstr "Haj"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -863,7 +863,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
@@ -876,15 +876,15 @@ 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
@@ -927,14 +927,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"
@@ -1000,7 +1000,7 @@ msgstr "Tutu aplikaciju zniÄić"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Njepřizjewjeny."
@@ -1029,7 +1029,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ć"
@@ -1234,7 +1234,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)."
@@ -1242,7 +1242,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."
@@ -1259,7 +1259,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."
@@ -1442,7 +1442,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -1613,11 +1613,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."
@@ -1661,13 +1661,13 @@ msgstr "Wužiwar hižo ma tutu rólu."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Žadyn profil podaty."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Žadyn profil z tym ID."
@@ -1803,7 +1803,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 ""
@@ -1812,7 +1812,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
@@ -1870,7 +1870,7 @@ 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."
@@ -1878,7 +1878,7 @@ 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
@@ -2021,16 +2021,17 @@ 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."
@@ -2070,11 +2071,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 ""
@@ -2162,7 +2163,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."
@@ -2177,51 +2178,51 @@ 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 ""
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2335,7 +2336,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
@@ -2384,12 +2385,12 @@ 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"
@@ -2416,30 +2417,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 "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 "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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -2506,12 +2507,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."
@@ -2542,23 +2543,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."
@@ -2769,6 +2770,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"
@@ -2778,43 +2781,43 @@ msgstr "Profilowe informacije"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Dospołne mjeno"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Startowa strona"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+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 ""
@@ -2854,7 +2857,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)."
@@ -3004,11 +3007,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."
@@ -3030,7 +3033,7 @@ msgstr ""
#: 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."
@@ -3080,7 +3083,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 ""
@@ -3098,88 +3101,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 "
@@ -3198,7 +3223,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.)"
@@ -3214,11 +3239,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"
@@ -3251,7 +3276,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."
@@ -3273,7 +3298,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"
@@ -3341,7 +3366,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"
@@ -3395,10 +3420,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"
@@ -3409,7 +3434,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"
@@ -3426,7 +3451,7 @@ msgstr ""
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Aplikaciske akcije"
#: actions/showapplication.php:236
msgid "Reset key & secret"
@@ -3434,7 +3459,7 @@ msgstr ""
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Aplikaciske informacije"
#: actions/showapplication.php:263
msgid "Consumer key"
@@ -3873,7 +3898,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
@@ -4095,7 +4120,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
@@ -4312,7 +4337,7 @@ msgstr ""
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "Abonement awtorizować"
#: actions/userauthorization.php:110
msgid ""
@@ -4321,7 +4346,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"
@@ -4401,7 +4426,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"
@@ -4425,12 +4450,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
@@ -4442,29 +4467,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 "
@@ -4472,7 +4497,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 "
@@ -4480,39 +4505,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:779
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 ""
@@ -4551,45 +4576,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 "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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5048,12 +5073,12 @@ 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
@@ -5099,7 +5124,7 @@ 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
@@ -5151,7 +5176,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
@@ -5161,7 +5186,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"
@@ -5171,17 +5196,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"
@@ -5189,7 +5214,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"
@@ -5266,17 +5291,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
@@ -5297,6 +5322,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.
@@ -5307,7 +5333,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"
@@ -5366,7 +5392,7 @@ msgstr ""
#: 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."
@@ -5424,7 +5450,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:"
@@ -5498,11 +5524,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"
@@ -5524,6 +5550,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."
@@ -5665,12 +5693,12 @@ msgstr ""
#: 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."
@@ -5678,11 +5706,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."
@@ -5755,8 +5783,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"
@@ -5772,19 +5807,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"
@@ -5798,30 +5833,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 "
@@ -5838,13 +5873,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"
@@ -5864,13 +5899,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"
@@ -5892,7 +5927,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"
@@ -5900,13 +5935,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"
@@ -5943,7 +5978,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 "wot"
@@ -6044,7 +6079,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"
@@ -6097,23 +6132,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"
@@ -6167,7 +6202,7 @@ msgstr "Fawority"
#: lib/personalgroupnav.php:125
msgid "Inbox"
-msgstr ""
+msgstr "Dochadny póst"
#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
@@ -6175,7 +6210,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"
@@ -6217,15 +6252,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"
@@ -6247,7 +6282,7 @@ msgstr ""
msgid "Popular"
msgstr "Woblubowany"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Žane wróćenske argumenty."
@@ -6268,7 +6303,7 @@ msgstr "Tutu zdźělenku wospjetować"
msgid "Revoke the \"%s\" role from this user"
msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6446,56 +6481,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "před něšto sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
@@ -6515,3 +6550,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 1b05490b9..77b7e0dd4 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:18+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:01:59+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -83,24 +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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Pagina non existe."
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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
@@ -113,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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amicos, pagina %2$d"
@@ -121,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -155,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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -165,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -174,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -184,14 +184,14 @@ msgstr ""
"pulsata a %s o publicar un message a su attention."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -202,22 +202,22 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -226,12 +226,12 @@ msgstr "Methodo API non trovate."
#: 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:209
+#: 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."
@@ -263,7 +263,7 @@ msgstr "Non poteva salveguardar le profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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 "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:114
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."
@@ -389,119 +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
+#: 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 "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
+#: 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."
-#: 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
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
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"
@@ -516,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
@@ -597,8 +597,8 @@ msgstr ""
msgid "Account"
msgstr "Conto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -606,8 +606,8 @@ msgid "Nickname"
msgstr "Pseudonymo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasigno"
@@ -623,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:108
msgid "This method requires a POST or DELETE."
msgstr "Iste methodo require un commando POST o DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Tu non pote deler le stato de un altere usator."
@@ -644,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trovate."
-#: actions/apistatusesupdate.php:316 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,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:196 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:201 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!"
@@ -715,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!"
@@ -778,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"
@@ -818,11 +818,11 @@ msgstr "Avatar delite."
msgid "You already blocked that user."
msgstr "Tu ha ja blocate iste usator."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocar usator"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -837,7 +837,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -846,7 +846,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non blocar iste usator"
@@ -855,7 +855,7 @@ msgstr "Non blocar iste usator"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -863,11 +863,11 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocar iste usator"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
@@ -1028,7 +1028,7 @@ msgstr "Deler iste application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non identificate."
@@ -1059,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"
@@ -1478,7 +1478,7 @@ msgid "Cannot normalize that email address"
msgstr "Non pote normalisar iste adresse de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
@@ -1705,13 +1705,13 @@ msgstr "Le usator ha ja iste rolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nulle profilo specificate."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Non existe un profilo con iste ID."
@@ -1852,7 +1852,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"
@@ -2279,42 +2279,42 @@ msgstr "Tu non es membro de iste gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s quitava le gruppo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Tu es ja identificate."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nomine de usator o contrasigno incorrecte."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Error de acceder al conto de usator. Tu probabilemente non es autorisate."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aperir session"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Identificar te a iste sito"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Memorar me"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Aperir session automaticamente in le futuro; non pro computatores usate in "
"commun!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Contrasigno perdite o oblidate?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2322,11 +2322,11 @@ msgstr ""
"Pro motivos de securitate, per favor re-entra tu nomine de usator e "
"contrasigno ante de cambiar tu configurationes."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Aperi un session con tu nomine de usator e contrasigno."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2535,30 +2535,30 @@ msgstr ""
"Le programmatores pote modificar le parametros de registration pro lor "
"applicationes "
-#: actions/oembed.php:79 actions/shownotice.php:100
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
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
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
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 "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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2662,7 +2662,7 @@ msgid "6 or more characters"
msgstr "6 o plus characteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2674,11 +2674,11 @@ msgstr "Identic al contrasigno hic supra"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Le contrasigno debe haber al minus 6 characteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Le contrasignos non corresponde."
@@ -2904,43 +2904,43 @@ msgstr "Information de profilo"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nomine complete"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina personal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL de tu pagina personal, blog o profilo in un altere sito"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Describe te e tu interesses in %d characteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Describe te e tu interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Loco"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
@@ -2983,7 +2983,7 @@ msgid ""
msgstr ""
"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio es troppo longe (max %d chars)."
@@ -3244,7 +3244,7 @@ msgstr "Le contrasigno debe haber 6 characteres o plus."
msgid "Password and confirmation do not match."
msgstr "Contrasigno e confirmation non corresponde."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error durante le configuration del usator."
@@ -3252,39 +3252,39 @@ msgstr "Error durante le configuration del usator."
msgid "New password successfully saved. You are now logged in."
msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Pardono, solmente le personas invitate pote registrar se."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Pardono, le codice de invitation es invalide."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php: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
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3292,35 +3292,58 @@ msgstr ""
"Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
"notas e mitter te in contacto con amicos e collegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o plus characteres. Requirite."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Identic al contrasigno hic supra. Requirite."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Usate solmente pro actualisationes, notificationes e recuperation de "
"contrasigno"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
-#: actions/register.php:494
+#: 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, "
@@ -3330,7 +3353,7 @@ msgstr ""
"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 "
@@ -3362,7 +3385,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.)"
@@ -3445,7 +3468,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"
@@ -3519,7 +3542,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"
@@ -3576,7 +3599,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"
@@ -3587,7 +3610,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"
@@ -4562,7 +4585,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"
@@ -4692,18 +4715,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, "
@@ -4712,11 +4735,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 "
@@ -4728,7 +4751,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 "
@@ -4740,7 +4763,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 "
@@ -4749,20 +4772,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:779
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 "
@@ -4771,12 +4794,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."
@@ -4815,27 +4838,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
+#: 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."
@@ -4843,21 +4866,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5451,11 +5474,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"
@@ -5549,14 +5572,14 @@ msgstr "Nomine complete: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Loco: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pagina personal: %s"
@@ -6090,8 +6113,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seque ora tu notas in %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6117,19 +6147,19 @@ msgstr ""
"Cambia tu adresse de e-mail o optiones de notification a %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nove adresse de e-mail pro publicar in %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6151,30 +6181,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Stato de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te ha pulsate"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6202,13 +6232,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nove message private de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6242,13 +6272,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha addite tu nota como favorite"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6287,7 +6317,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6298,13 +6328,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ha inviate un nota a tu attention"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6366,7 +6396,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"
@@ -6526,23 +6556,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"
@@ -6652,7 +6682,7 @@ msgstr "Media de cata die"
msgid "All groups"
msgstr "Tote le gruppos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Methodo non implementate."
@@ -6676,7 +6706,7 @@ msgstr "In evidentia"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Nulle parametro return-to."
@@ -6697,7 +6727,7 @@ msgstr "Repeter iste nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar le rolo \"%s\" de iste usator"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nulle signule usator definite pro le modo de singule usator."
@@ -6875,56 +6905,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "alcun secundas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "circa un minuta retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "circa un hora retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "circa un die retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "circa un mense retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "circa un anno retro"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 2b2f19f5d..29c4ae34b 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:21+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:03+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -186,14 +186,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -204,22 +204,22 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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!"
@@ -229,12 +229,12 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -604,8 +604,8 @@ msgstr ""
msgid "Account"
msgstr "Aðgangur"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -613,8 +613,8 @@ msgid "Nickname"
msgstr "Stuttnefni"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Lykilorð"
@@ -631,11 +631,11 @@ msgstr "Allt"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Þessi aðferð krefst POST eða DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Fannst ekki."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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"
@@ -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"
@@ -1516,7 +1516,7 @@ msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
@@ -1754,13 +1754,13 @@ msgstr "Notandi hefur enga persónulega síðu."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Engin persónuleg síða tilgreind"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Engin persónulega síða með þessu einkenni"
@@ -1895,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 "Rás %s"
@@ -2320,42 +2320,42 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
msgid "%1$s left group %2$s"
msgstr "%s gekk úr hópnum %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Þú hefur nú þegar skráð þig inn."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Rangt notendanafn eða lykilorð."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
"með þér!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Tapað eða gleymt lykilorð?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2363,12 +2363,12 @@ msgstr ""
"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
"lykilorð áður en þú breytir stillingunum þínum."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Skráðu þig inn með notendanafni og lykilorði"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2580,31 +2580,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -2715,7 +2715,7 @@ msgid "6 or more characters"
msgstr "6 eða fleiri tákn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Staðfesta"
@@ -2727,11 +2727,11 @@ msgstr "Sama og lykilorðið hér fyrir ofan"
msgid "Change"
msgstr "Breyta"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Lykilorðin passa ekki saman."
@@ -2967,46 +2967,46 @@ msgstr "Upplýsingar á persónulegri síðu"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt nafn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimasíða"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
"vefsvæði"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Lýstu þér og þínum "
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Lýsing"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Staðsetning"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
@@ -3050,7 +3050,7 @@ msgstr ""
"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
"(best fyrir ómannlega notendur)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
@@ -3299,7 +3299,7 @@ msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
msgid "Password and confirmation do not match."
msgstr "Lykilorð og staðfesting passa ekki saman."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
@@ -3307,80 +3307,102 @@ msgstr "Villa kom upp í stillingu notanda."
msgid "New password successfully saved. You are now logged in."
msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3413,7 +3435,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.)"
@@ -3503,7 +3525,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"
@@ -3574,7 +3596,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"
@@ -3636,7 +3658,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"
@@ -3649,7 +3671,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"
@@ -4615,7 +4637,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 ""
@@ -4743,29 +4765,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 "
@@ -4773,7 +4795,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 "
@@ -4781,40 +4803,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:779
#, 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 ""
@@ -4858,48 +4880,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5531,12 +5553,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"
@@ -5629,14 +5651,14 @@ msgstr "Fullt nafn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Staðsetning: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Heimasíða: %s"
@@ -6127,8 +6149,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s er að hlusta á bablið þitt á %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6144,7 +6173,7 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6152,13 +6181,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nýtt tölvupóstfang til að senda á %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6180,30 +6209,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Staða %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS staðfesting"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ýtti við þér"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6220,13 +6249,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ný persónuleg skilaboð frá %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6246,13 +6275,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s heldur upp á babl frá þér"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6274,7 +6303,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6282,13 +6311,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6325,7 +6354,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á"
@@ -6485,24 +6514,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"
@@ -6615,7 +6644,7 @@ msgstr ""
msgid "All groups"
msgstr "Allir hópar"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6639,7 +6668,7 @@ msgstr "à sviðsljósinu"
msgid "Popular"
msgstr "Vinsælt"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Ekkert einkenni gefið upp."
@@ -6663,7 +6692,7 @@ msgstr "Svara þessu babli"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6848,56 +6877,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 6b6351f89..07197dd65 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:25+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:06+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -86,24 +86,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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "Utente inesistente."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amici, pagina %2$d"
@@ -124,33 +124,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -158,7 +158,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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -168,7 +168,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -178,7 +178,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,14 +188,14 @@ msgstr ""
"un messaggio alla sua attenzione."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -206,22 +206,22 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -230,12 +230,12 @@ msgstr "Metodo delle API non trovato."
#: 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:209
+#: 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."
@@ -267,7 +267,7 @@ msgstr "Impossibile salvare il profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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 +326,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:114
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 +393,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 +522,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
@@ -601,8 +601,8 @@ msgstr ""
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Soprannome"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Password"
@@ -627,11 +627,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:108
msgid "This method requires a POST or DELETE."
msgstr "Questo metodo richiede POST o DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Non puoi eliminare il messaggio di un altro utente."
@@ -648,25 +648,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trovato."
-#: actions/apistatusesupdate.php:316 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 +676,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:196 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:201 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 +716,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 +779,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 +819,11 @@ msgstr "Immagine eliminata."
msgid "You already blocked that user."
msgstr "Hai già bloccato quell'utente."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocca utente"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -838,7 +838,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -847,7 +847,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloccare questo utente"
@@ -856,7 +856,7 @@ msgstr "Non bloccare questo utente"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -864,11 +864,11 @@ msgid "Yes"
msgstr "Sì"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
@@ -1028,7 +1028,7 @@ msgstr "Elimina l'applicazione"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Accesso non effettuato."
@@ -1059,7 +1059,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"
@@ -1481,7 +1481,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare quell'indirizzo email"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
@@ -1709,13 +1709,13 @@ msgstr "L'utente ricopre già questo ruolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nessun profilo specificato."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Nessun profilo con quel ID."
@@ -1856,7 +1856,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"
@@ -2282,39 +2282,39 @@ msgstr "Non fai parte di quel gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Accesso già effettuato."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome utente o password non corretto."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Password persa o dimenticata?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2322,11 +2322,11 @@ msgstr ""
"Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e "
"la tua password prima di modificare le impostazioni."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Accedi con nome utente e password."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2533,30 +2533,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2661,7 +2661,7 @@ msgid "6 or more characters"
msgstr "6 o più caratteri"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Conferma"
@@ -2673,11 +2673,11 @@ msgstr "Stessa password di sopra"
msgid "Change"
msgstr "Modifica"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "La password deve essere di 6 o più caratteri."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Le password non corrispondono."
@@ -2904,43 +2904,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina web"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL della tua pagina web, blog o profilo su un altro sito"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descriviti assieme ai tuoi interessi in %d caratteri"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descrivi te e i tuoi interessi"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicazione"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dove ti trovi, tipo \"città, regione, stato\""
@@ -2983,7 +2983,7 @@ msgstr ""
"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
"umani)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max %d caratteri)."
@@ -3242,7 +3242,7 @@ msgstr "La password deve essere lunga almeno 6 caratteri."
msgid "Password and confirmation do not match."
msgstr "La password e la conferma non corrispondono."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
@@ -3250,39 +3250,39 @@ msgstr "Errore nell'impostare l'utente."
msgid "New password successfully saved. You are now logged in."
msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Solo le persone invitate possono registrarsi."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Codice di invito non valido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3291,34 +3291,57 @@ msgstr ""
"successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
"colleghi. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o più caratteri; richiesta"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Stessa password di sopra; richiesta"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usata solo per aggiornamenti, annunci e recupero password"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-#: actions/register.php: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, "
@@ -3328,7 +3351,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 "
@@ -3362,7 +3385,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.)"
@@ -3445,7 +3468,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"
@@ -3519,7 +3542,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"
@@ -3576,7 +3599,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"
@@ -3587,7 +3610,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"
@@ -4561,7 +4584,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"
@@ -4690,18 +4713,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, "
@@ -4710,11 +4733,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 "
@@ -4726,7 +4749,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 "
@@ -4738,7 +4761,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 "
@@ -4747,20 +4770,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:779
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 "
@@ -4769,13 +4792,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 ""
@@ -4815,27 +4838,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."
@@ -4843,21 +4866,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5452,11 +5475,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"
@@ -5550,14 +5573,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Posizione: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pagina web: %s"
@@ -6095,8 +6118,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"
@@ -6122,19 +6155,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"
@@ -6156,31 +6189,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 "
@@ -6208,13 +6241,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"
@@ -6248,13 +6281,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"
@@ -6293,7 +6326,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 +6337,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"
@@ -6373,7 +6406,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"
@@ -6532,23 +6565,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"
@@ -6658,7 +6691,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"
@@ -6682,7 +6715,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."
@@ -6703,7 +6736,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."
@@ -6881,56 +6914,56 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "pochi secondi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "circa un minuto fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "circa un'ora fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "circa un giorno fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "circa un mese fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index d3943819a..7d56146ae 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:28+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:10+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s ã¨å‹äººã€ãƒšãƒ¼ã‚¸ %2$d"
@@ -126,39 +126,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -168,7 +168,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -177,7 +177,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,14 +187,14 @@ msgstr ""
"ã›ã‚’é€ã£ã¦ã¿ã¾ã›ã‚“ã‹ã€‚"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
@@ -205,22 +205,22 @@ msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
@@ -229,12 +229,12 @@ msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: 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:209
+#: 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 ãŒå¿…è¦ã§ã™ã€‚"
@@ -267,7 +267,7 @@ msgstr "プロフィールをä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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 +326,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:114
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 +394,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 +524,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
@@ -599,8 +599,8 @@ msgstr ""
msgid "Account"
msgstr "アカウント"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -608,8 +608,8 @@ msgid "Nickname"
msgstr "ニックãƒãƒ¼ãƒ "
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "パスワード"
@@ -625,11 +625,11 @@ msgstr "許å¯"
msgid "Allow or deny access to your account information."
msgstr "アカウント情報ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã™ã‚‹ã‹ã€ã¾ãŸã¯æ‹’絶ã—ã¦ãã ã•ã„。"
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ã‹ DELETE ãŒå¿…è¦ã§ã™ã€‚"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "ä»–ã®ãƒ¦ãƒ¼ã‚¶ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’消ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
@@ -646,25 +646,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/apistatusesupdate.php:316 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 +673,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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s ã®ãƒ‘ブリックタイムライン"
-#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "皆ã‹ã‚‰ã® %s アップデート!"
@@ -713,12 +713,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 +775,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 +816,11 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"
msgid "You already blocked that user."
msgstr "ãã®ãƒ¦ãƒ¼ã‚¶ã¯ã™ã§ã«ãƒ–ロック済ã¿ã§ã™ã€‚"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "ユーザをブロック"
-#: actions/block.php:130
+#: actions/block.php:138
#, fuzzy
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
@@ -836,7 +836,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -846,7 +846,7 @@ msgstr "No"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブロックã™ã‚‹"
@@ -855,7 +855,7 @@ msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブロックã™ã‚‹"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -864,11 +864,11 @@ msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロックã™ã‚‹"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ブロック情報ã®ä¿å­˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
@@ -1029,7 +1029,7 @@ msgstr "ã“ã®ã‚¢ãƒ—リケーションを削除"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "ログインã—ã¦ã„ã¾ã›ã‚“。"
@@ -1060,7 +1060,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 "ã“ã®ã¤ã¶ã‚„ãを削除"
@@ -1487,7 +1487,7 @@ msgid "Cannot normalize that email address"
msgstr "ãã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æ­£è¦åŒ–ã§ãã¾ã›ã‚“"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "有効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -1723,13 +1723,13 @@ msgstr "ユーザã¯æ—¢ã«é»™ã£ã¦ã„ã¾ã™ã€‚"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "プロファイル記述ãŒã‚ã‚Šã¾ã›ã‚“。"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "ãã®ï¼©ï¼¤ã®ãƒ—ロファイルãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -1869,7 +1869,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 +2300,39 @@ msgstr "ã‚ãªãŸã¯ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
msgid "%1$s left group %2$s"
msgstr "%1$s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %2$s ã«æ®‹ã‚Šã¾ã—ãŸã€‚"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "æ—¢ã«ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™ã€‚"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "ユーザåã¾ãŸã¯ãƒ‘スワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "ユーザ設定エラー。 ã‚ãªãŸã¯ãŸã¶ã‚“承èªã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ログイン状態をä¿æŒ"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "以é™ã¯è‡ªå‹•çš„ã«ãƒ­ã‚°ã‚¤ãƒ³ã™ã‚‹ã€‚共用コンピューターã§ã¯é¿ã‘ã¾ã—ょã†ï¼"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "パスワードを紛失ã€å¿˜ã‚ŒãŸï¼Ÿ"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2340,12 +2340,12 @@ msgstr ""
"セキュリティー上ã®ç†ç”±ã«ã‚ˆã‚Šã€è¨­å®šã‚’変更ã™ã‚‹å‰ã«ãƒ¦ãƒ¼ã‚¶åã¨ãƒ‘スワードを入力ã—"
"ã¦ä¸‹ã•ã„。"
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "ユーザåã¨ãƒ‘スワードã§ãƒ­ã‚°ã‚¤ãƒ³"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2553,31 +2553,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$ ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹"
#. 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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„データ形å¼ã€‚"
@@ -2682,7 +2682,7 @@ msgid "6 or more characters"
msgstr "6文字以上"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "パスワード確èª"
@@ -2694,11 +2694,11 @@ msgstr "上ã¨åŒã˜ãƒ‘スワード"
msgid "Change"
msgstr "変更"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "パスワードã¯6文字以上ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。"
@@ -2924,43 +2924,43 @@ msgstr "プロファイル情報"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64文字ã®ã€å°æ–‡å­—アルファベットã‹æ•°å­—ã§ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚„å¥èª­ç‚¹ã¯é™¤ã"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "フルãƒãƒ¼ãƒ "
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ホームページ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ホームページã€ãƒ–ログã€ãƒ—ロファイルã€ãã®ä»–サイト㮠URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "%d字以内ã§è‡ªåˆ†è‡ªèº«ã¨è‡ªåˆ†ã®èˆˆå‘³ã«ã¤ã„ã¦æ›¸ã„ã¦ãã ã•ã„"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "自分自身ã¨è‡ªåˆ†ã®èˆˆå‘³ã«ã¤ã„ã¦æ›¸ã„ã¦ãã ã•ã„"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自己紹介"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "場所"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "自分ã®ã„る場所。例:「都市, 都é“府県 (ã¾ãŸã¯åœ°åŸŸ), 国ã€"
@@ -3002,7 +3002,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自分をフォローã—ã¦ã„る者を自動的ã«ãƒ•ã‚©ãƒ­ãƒ¼ã™ã‚‹ (BOTã«æœ€é©)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介ãŒé•·ã™ãŽã¾ã™ (最長140文字)。"
@@ -3263,7 +3263,7 @@ msgstr "パスワードã¯6字以上ã§ãªã‘ã‚Œã°ã„ã‘ã¾ã›ã‚“。"
msgid "Password and confirmation do not match."
msgstr "パスワードã¨ç¢ºèªãŒä¸€è‡´ã—ã¾ã›ã‚“。"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ユーザ設定エラー"
@@ -3271,39 +3271,39 @@ msgstr "ユーザ設定エラー"
msgid "New password successfully saved. You are now logged in."
msgstr "æ–°ã—ã„パスワードã®ä¿å­˜ã«æˆåŠŸã—ã¾ã—ãŸã€‚ログインã—ã¦ã„ã¾ã™ã€‚"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "ã™ã¿ã¾ã›ã‚“ã€æ‹›å¾…ã•ã‚ŒãŸäººã€…ã ã‘ãŒç™»éŒ²ã§ãã¾ã™ã€‚"
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "ã™ã¿ã¾ã›ã‚“ã€ä¸æ­£ãªæ‹›å¾…コード。"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "登録æˆåŠŸ"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3312,41 +3312,63 @@ msgstr ""
"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã§æ–°ã—ã„アカウントを作æˆã§ãã¾ã™ã€‚ 次ã«ã¤ã¶ã‚„ãを投稿ã—ã¦ã€å‹äººã‚„"
"åŒåƒšã«ãƒªãƒ³ã‚¯ã§ãã¾ã™ã€‚ "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64文字ã®ã€å°æ–‡å­—アルファベットã‹æ•°å­—ã§ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚„å¥èª­ç‚¹ã¯é™¤ã。必須ã§ã™ã€‚"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6文字以上。必須ã§ã™ã€‚"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "上ã®ãƒ‘スワードã¨åŒã˜ã§ã™ã€‚ 必須。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "メール"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "æ›´æ–°ã€ã‚¢ãƒŠã‚¦ãƒ³ã‚¹ã€ãƒ‘スワードリカãƒãƒªãƒ¼ã§ã®ã¿ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "é•·ã„åå‰"
-#: actions/register.php: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 "
@@ -3379,7 +3401,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.)"
@@ -3463,7 +3485,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 "ç¹°ã‚Šè¿”ã•ã‚ŒãŸ"
@@ -3539,7 +3561,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"
@@ -3596,7 +3618,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 "åå‰"
@@ -3607,7 +3629,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 "概è¦"
@@ -4602,7 +4624,7 @@ msgstr ""
"ユーザã®ã¤ã¶ã‚„ãをフォローã™ã‚‹ã«ã¯è©³ç´°ã‚’確èªã—ã¦ä¸‹ã•ã„。ã ã‚Œã‹ã®ã¤ã¶ã‚„ãã‚’"
"フォローã™ã‚‹ãŸã‚ã«å°‹ã­ãªã„å ´åˆã¯ã€\"Reject\" をクリックã—ã¦ä¸‹ã•ã„。"
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "ライセンス"
@@ -4732,18 +4754,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, "
@@ -4752,11 +4774,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 "
@@ -4764,7 +4786,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 "
@@ -4772,27 +4794,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:779
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 "
@@ -4802,13 +4824,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 ""
@@ -4849,26 +4871,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."
@@ -4876,21 +4898,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5508,11 +5530,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 "パスワード変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -5606,14 +5628,14 @@ msgstr "フルãƒãƒ¼ãƒ ï¼š %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "場所: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "ホームページ: %s"
@@ -6103,8 +6125,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 㯠%2$s ã§ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’èžã„ã¦ã„ã¾ã™ã€‚"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6130,19 +6159,19 @@ msgstr ""
"%8$s ã§ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹é€šçŸ¥ã‚ªãƒ—ションを変ãˆã¦ãã ã•ã„。\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "自己紹介: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ã¸æŠ•ç¨¿ã®ãŸã‚ã®æ–°ã—ã„メールアドレス"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, fuzzy, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6164,30 +6193,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ã®çŠ¶æ…‹"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS確èª"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "ã“ã®é›»è©±ç•ªå·ã¯ç¢ºèªå¾…ã¡ã§ã™ã€‚"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "ã‚ãªãŸã¯ %s ã«åˆå›³ã•ã‚Œã¦ã„ã¾ã™"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6215,13 +6244,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s ã‹ã‚‰ã®æ–°ã—ã„プライベートメッセージ"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6255,13 +6284,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ã¯ãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ã‚ãªãŸã®ã¤ã¶ã‚„ãを加ãˆã¾ã—ãŸ"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6300,7 +6329,7 @@ msgstr ""
"%6%s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6308,13 +6337,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ã¯ã‚ãªãŸå®›ã¦ã«ã¤ã¶ã‚„ãã‚’é€ã‚Šã¾ã—ãŸ"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6354,7 +6383,7 @@ msgstr ""
"ã«å¼•ã込むプライベートメッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚人々ã¯ã‚ãªãŸã ã‘ã¸ã®"
"メッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "from"
@@ -6521,23 +6550,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 "ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¾ã—ãŸ"
@@ -6647,7 +6676,7 @@ msgstr ""
msgid "All groups"
msgstr "å…¨ã¦ã®ã‚°ãƒ«ãƒ¼ãƒ—"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "未実装ã®ãƒ¡ã‚½ãƒƒãƒ‰ã€‚"
@@ -6671,7 +6700,7 @@ msgstr "フィーãƒãƒ£ãƒ¼ã•ã‚ŒãŸ"
msgid "Popular"
msgstr "人気"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "return-to 引数ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -6692,7 +6721,7 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã™"
msgid "Revoke the \"%s\" role from this user"
msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブロック"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "single-user モードã®ãŸã‚ã®ã‚·ãƒ³ã‚°ãƒ«ãƒ¦ãƒ¼ã‚¶ãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
@@ -6874,56 +6903,56 @@ msgid "Moderator"
msgstr "管ç†"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "数秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ç´„ 1 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ç´„ %d 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ç´„ 1 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ç´„ %d 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ç´„ 1 æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ç´„ %d æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ç´„ 1 ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ç´„ %d ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ç´„ 1 å¹´å‰"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 835611a9f..4e447f593 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:31+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:13+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -83,24 +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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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
@@ -113,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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s ë° ì¹œêµ¬ë“¤, %d 페ì´ì§€"
@@ -121,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -163,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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -178,14 +178,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 ë° ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!"
@@ -196,22 +196,22 @@ msgstr "%2$sì— ìžˆëŠ” %1$s ë° ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 메서드 발견 안 ë¨."
@@ -220,12 +220,12 @@ msgstr "API 메서드 발견 안 ë¨."
#: 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:209
+#: 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를 요구합니다."
@@ -255,7 +255,7 @@ msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í•  수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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
@@ -314,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:114
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 "관심소ì‹ì„ 삭제할 수 없습니다."
@@ -381,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 ìƒì˜ 그룹들"
@@ -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
@@ -589,8 +589,8 @@ msgstr ""
msgid "Account"
msgstr "계정"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -598,8 +598,8 @@ msgid "Nickname"
msgstr "별명"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "비밀 번호"
@@ -615,11 +615,11 @@ msgstr "허용"
msgid "Allow or deny access to your account information."
msgstr "계정 ì •ë³´ì— ëŒ€í•œ ì ‘ê·¼ì„ í—ˆìš© ë˜ëŠ” 거부합니다."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "ì´ ë©”ì„œë“œëŠ” POST ë˜ëŠ” DELETE를 요구합니다."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "ë‹¹ì‹ ì€ ë‹¤ë¥¸ 사용ìžì˜ ìƒíƒœë¥¼ 삭제하지 ì•Šì•„ë„ ëœë‹¤."
@@ -636,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "ì°¾ì„ ìˆ˜ê°€ 없습니다."
-#: actions/apistatusesupdate.php:316 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 글ìžìž…니다."
@@ -663,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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 공개 타임ë¼ì¸"
-#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "모ë‘ë¡œë¶€í„°ì˜ ì—…ë°ì´íŠ¸ %sê°œ!"
@@ -703,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ì˜ ì—…ë°ì´íŠ¸!"
@@ -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 "
@@ -825,7 +825,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -835,7 +835,7 @@ msgstr "아니오"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "ì´ìš©ìžë¥¼ 차단하지 않는다."
@@ -844,7 +844,7 @@ msgstr "ì´ìš©ìžë¥¼ 차단하지 않는다."
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -853,11 +853,11 @@ msgid "Yes"
msgstr "네, 맞습니다."
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "ì´ ì‚¬ìš©ìž ì°¨ë‹¨í•˜ê¸°"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ì •ë³´ì°¨ë‹¨ì„ ì €ìž¥í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
@@ -1022,7 +1022,7 @@ msgstr "ì´ ê²Œì‹œê¸€ 삭제하기"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "로그ì¸í•˜ê³  있지 않습니다."
@@ -1054,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 "ì´ ê²Œì‹œê¸€ 삭제하기"
@@ -1491,7 +1491,7 @@ msgid "Cannot normalize that email address"
msgstr "ê·¸ ì´ë©”ì¼ ì£¼ì†Œë¥¼ 정규화 í•  수 없습니다."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "유효한 ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다."
@@ -1726,13 +1726,13 @@ msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "í”„ë¡œí•„ì„ ì§€ì •í•˜ì§€ 않았습니다."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "해당 IDì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
@@ -1878,7 +1878,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 타임ë¼ì¸"
@@ -2294,52 +2294,52 @@ msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
msgid "%1$s left group %2$s"
msgstr "%s가 그룹%s를 떠났습니다."
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "ì´ë¯¸ ë¡œê·¸ì¸ í•˜ì…¨ìŠµë‹ˆë‹¤."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "틀린 계정 ë˜ëŠ” 비밀 번호"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "ì¸ì¦ì´ ë˜ì§€ 않았습니다."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "로그ì¸"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "사ì´íŠ¸ì— 로그ì¸í•˜ì„¸ìš”."
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ìžë™ 로그ì¸"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 ìžë™ìœ¼ë¡œ 로그ì¸í•©ë‹ˆë‹¤. 공용 컴퓨터ì—서는 ì´ìš©í•˜ì§€ 마십시오!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "비밀 번호를 잊으셨나요?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"ë³´ì•ˆì„ ìœ„í•´ ì„¸íŒ…ì„ ì €ìž¥í•˜ê¸° ì „ì— ê³„ì •ê³¼ 비밀 번호를 다시 ìž…ë ¥ í•´ 주십시오."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "ì‚¬ìš©ìž ì´ë¦„ê³¼ 비밀번호로 로그ì¸"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2549,31 +2549,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다."
@@ -2683,7 +2683,7 @@ msgid "6 or more characters"
msgstr "6ê¸€ìž ì´ìƒ"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "ì¸ì¦"
@@ -2695,11 +2695,11 @@ msgstr "위와 ê°™ì€ ë¹„ë°€ 번호"
msgid "Change"
msgstr "변환"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "비밀번호는 6ìžë¦¬ ì´ìƒì´ì–´ì•¼ 합니다."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "비밀 번호가 ì¼ì¹˜í•˜ì§€ 않습니다."
@@ -2936,44 +2936,44 @@ msgstr "프로필 정보"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64ìž ì‚¬ì´ì— ì˜ì†Œë¬¸ìž, 숫ìžë¡œë§Œ ì”니다. 기호나 ê³µë°±ì„ ì“°ë©´ 안 ë©ë‹ˆë‹¤."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "실명"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "홈페ì´ì§€"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ê·€í•˜ì˜ í™ˆíŽ˜ì´ì§€, 블로그 í˜¹ì€ ë‹¤ë¥¸ 사ì´íŠ¸ì˜ 프로필 페ì´ì§€ URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "140ìž ì´ë‚´ì—ì„œ ìžê¸° 소개"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "ë‹¹ì‹ ì— ëŒ€í•´ 소개해주세요."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ìžê¸°ì†Œê°œ"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "위치"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "ë‹¹ì‹ ì€ ì–´ë””ì— ì‚½ë‹ˆê¹Œ? \"ì‹œ, ë„ (or êµ°,구), 나ë¼"
@@ -3013,7 +3013,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "나ì—게 구ë…하는 사람ì—게 ìžë™ êµ¬ë… ì‹ ì²­"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "ìžê¸°ì†Œê°œê°€ 너무 ê¹ë‹ˆë‹¤. (최대 140글ìž)"
@@ -3264,7 +3264,7 @@ msgstr "비밀 번호는 6ìž ì´ìƒì´ì–´ì•¼ 합니다."
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 ì¼ì¹˜í•˜ì§€ 않습니다."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ì‚¬ìš©ìž ì„¸íŒ… 오류"
@@ -3273,81 +3273,103 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"새로운 비밀 번호를 성공ì ìœ¼ë¡œ 저장했습니다. 귀하는 ì´ì œ ë¡œê·¸ì¸ ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "죄송합니다. 단지 ì´ˆëŒ€ëœ ì‚¬ëžŒë“¤ë§Œ 등ë¡í•  수 있습니다."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "í™•ì¸ ì½”ë“œ 오류"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "íšŒì› ê°€ìž…ì´ ì„±ê³µì ìž…니다."
-#: actions/register.php:114 actions/register.php: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 "
@@ -3380,7 +3402,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.)"
@@ -3467,7 +3489,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 "재전송ë¨"
@@ -3537,7 +3559,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 "아바타가 ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤."
@@ -3599,7 +3621,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"
@@ -3612,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 "설명"
@@ -4582,7 +4604,7 @@ msgstr ""
"사용ìžì˜ 통지를 구ë…하려면 ìƒì„¸ë¥¼ 확ì¸í•´ 주세요. 구ë…하지 않는 경우는, \"취소"
"\"를 í´ë¦­í•´ 주세요."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
#, fuzzy
msgid "License"
msgstr "ë¼ì´ì„ ìŠ¤"
@@ -4713,29 +4735,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 "
@@ -4743,7 +4765,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 "
@@ -4751,39 +4773,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:779
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 ""
@@ -4826,28 +4848,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 "
@@ -4856,22 +4878,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5503,12 +5525,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 "비밀번호 변경"
@@ -5601,14 +5623,14 @@ msgstr "ì „ì²´ì´ë¦„: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "위치: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "홈페ì´ì§€: %s"
@@ -6097,8 +6119,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$së‹˜ì´ ê·€í•˜ì˜ ì•Œë¦¼ 메시지를 %2$sì—ì„œ 듣고 있습니다."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6118,7 +6147,7 @@ msgstr ""
"그럼 ì´ë§Œ,%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6126,13 +6155,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%sì— í¬ìŠ¤íŒ… í•  새로운 ì´ë©”ì¼ ì£¼ì†Œ"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6148,30 +6177,30 @@ msgstr ""
"오.ì´ë©”ì¼ ì‚¬ìš©ë²•ì€ %3$s 페ì´ì§€ë¥¼ 보십시오.안녕히,%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ìƒíƒœ"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS ì¸ì¦"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "ì´ ì „í™” 번호는 ì¸ì¦ 대기중입니다."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 사용ìžê°€ 찔러 봤습니다."
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6188,13 +6217,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s로부터 새로운 비밀 메시지가 ë„착하였습니다."
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6214,13 +6243,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%së‹˜ì´ ë‹¹ì‹ ì˜ ê²Œì‹œê¸€ì„ ì¢‹ì•„í•˜ëŠ” 글로 추가했습니다."
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6242,7 +6271,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6250,13 +6279,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6293,7 +6322,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 "다ìŒì—ì„œ:"
@@ -6453,25 +6482,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 "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤."
@@ -6585,7 +6614,7 @@ msgstr ""
msgid "All groups"
msgstr "모든 그룹"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6609,7 +6638,7 @@ msgstr "피ì³ë§ë¨"
msgid "Popular"
msgstr "ì¸ê¸°ìžˆëŠ”"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "id ì¸ìžê°€ 없습니다."
@@ -6633,7 +6662,7 @@ msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기"
msgid "Revoke the \"%s\" role from this user"
msgstr "ì´ ê·¸ë£¹ì˜ íšŒì›ë¦¬ìŠ¤íŠ¸"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6823,56 +6852,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì „"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "1ë…„ ì „"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 215f5089c..89fb424da 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:38+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:17+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,14 +188,14 @@ msgstr ""
"прочита."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -206,22 +206,22 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 методот не е пронајден."
@@ -230,12 +230,12 @@ msgstr "API методот не е пронајден."
#: 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:209
+#: 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."
@@ -267,7 +267,7 @@ msgstr "Ðе може да Ñе зачува профил."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -601,8 +601,8 @@ msgstr ""
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Прекар"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Лозинка"
@@ -627,11 +627,11 @@ msgstr "Дозволи"
msgid "Allow or deny access to your account information."
msgstr "Дозволете или одбијте приÑтап до податоците за Вашата Ñметка."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Методот бара POST или DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе е пронајдено."
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Јавна иÑторија на %s"
-#: actions/apitimelinepublic.php:201 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 "Ðе можев да ги Ñнимам инофрмациите за блокот."
@@ -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 "Бриши ја оваа забелешка"
@@ -1251,7 +1251,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 +1314,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 +1484,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðеможам да ја нормализирам таа е-поштенÑка адреÑа"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ðеправилна адреÑа за е-пошта."
@@ -1712,13 +1712,13 @@ msgstr "КориÑникот веќе ја има таа улога."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ðема назначено профил."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðема профил Ñо тоа ID."
@@ -1835,7 +1835,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 +1861,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 +1991,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 +2002,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
@@ -2289,41 +2289,41 @@ msgstr "Ðе членувате во таа група."
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Веќе Ñте најавени."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Ðеточно кориÑничко име или лозинка"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Грешка при поÑтавувањето на кориÑникот. Веројатно не Ñе заверени."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ðајава"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ðајавете Ñе"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Следниот пат најавете Ñе автоматÑки; не е за компјутери кои ги делите Ñо "
"други!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ја загубивте или заборавивте лозинката?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2331,11 +2331,11 @@ msgstr ""
"Поради безбедноÑни причини треба повторно да го внеÑете Вашето кориÑничко "
"име и лозинка пред да ги Ñмените Вашите нагодувања."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Ðајавете Ñе Ñо кориÑничко име и лозинка."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2543,30 +2543,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -2671,7 +2671,7 @@ msgid "6 or more characters"
msgstr "6 или повеќе знаци"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Потврди"
@@ -2683,11 +2683,11 @@ msgstr "ИÑто како лозинката погоре"
msgid "Change"
msgstr "Промени"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Лозинката мора да Ñодржи барем 6 знаци."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Лозинките не Ñе Ñовпаѓаат."
@@ -2714,7 +2714,7 @@ msgstr "Патеки"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr "Ðагодувања за патеки и Ñервери за оваа StatusNet веб-Ñтраница."
+msgstr "Ðагодувања за патеки и опÑлужувачи за оваа StatusNet мрежно меÑто."
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2738,7 +2738,7 @@ 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"
@@ -2750,7 +2750,7 @@ msgstr "ОпÑлужувач"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr "Име на домаќинот на Ñерверот на веб-Ñтраницата"
+msgstr "Ðазив на домаќинот на опÑлужувачот на мрежното меÑто"
#: actions/pathsadminpanel.php:242
msgid "Path"
@@ -2782,7 +2782,7 @@ msgstr "Тема"
#: actions/pathsadminpanel.php:264
msgid "Theme server"
-msgstr "Сервер на темата"
+msgstr "OпÑлужувач на темата"
#: actions/pathsadminpanel.php:268
msgid "Theme path"
@@ -2798,7 +2798,7 @@ msgstr "Ðватари"
#: actions/pathsadminpanel.php:284
msgid "Avatar server"
-msgstr "Сервер на аватарот"
+msgstr "ОпÑлужувач на аватарот"
#: actions/pathsadminpanel.php:288
msgid "Avatar path"
@@ -2814,7 +2814,7 @@ msgstr "Позадини"
#: actions/pathsadminpanel.php:305
msgid "Background server"
-msgstr "Сервер на позаднината"
+msgstr "OпÑлужувач на позаднината"
#: actions/pathsadminpanel.php:309
msgid "Background path"
@@ -2850,11 +2850,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"
@@ -2914,43 +2914,43 @@ msgstr "Информации за профил"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 мали букви или бројки. Без интерпукциÑки знаци и празни меÑта."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Цело име"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Домашна Ñтраница"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL на Вашата домашна Ñтраница, блог или профил на друга веб-Ñтраница."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишете Ñе ÑебеÑи и Ñвоите интереÑи во %d знаци."
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишете Ñе ÑебеÑи и Вашите интереÑи"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Биографија"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Локација"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Каде Ñе наоѓате, на пр. „Град, ОблаÑÑ‚, Земја“."
@@ -2994,7 +2994,7 @@ msgstr ""
"ÐвтоматÑки претплаќај ме на Ñекој што Ñе претплаќа на мене (најдобро за "
"ботови и Ñл.)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е преголема (највеќе до %d знаци)."
@@ -3190,7 +3190,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
@@ -3257,7 +3257,7 @@ msgstr "Лозинката мора да биде од најмалку 6 зна
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не Ñе Ñовпаѓаат."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Грешка во поÑтавувањето на кориÑникот."
@@ -3265,39 +3265,39 @@ msgstr "Грешка во поÑтавувањето на кориÑникот."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовата лозинка е уÑпешно зачувана. Сега Ñте најавени."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Жалиме, региÑтрацијата е Ñамо Ñо покана."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Жалиме, неважечки код за поканата."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "РегиÑтрацијата е уÑпешна"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3305,35 +3305,59 @@ msgstr ""
"Со овој образец можете да Ñоздадете нова Ñметка. Потоа ќе можете да "
"објавувате забелешки и да Ñе поврзувате Ñо пријатели и колеги. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 мали букви или бројки, без интерпункциÑки знаци и празни меÑта. "
"Задолжително поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Барем 6 знаци. Задолжително поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "ИÑто што и лозинката погоре. Задолжително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Е-пошта"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Се кориÑти Ñамо за подновувања, објави и повраќање на лозинка."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Подолго име, по можноÑÑ‚ Вашето виÑтинÑко име и презиме"
-#: actions/register.php: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, "
@@ -3342,7 +3366,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 "
@@ -3376,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.)"
@@ -3459,7 +3483,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 "Повторено"
@@ -3533,7 +3557,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"
@@ -3590,7 +3614,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 "Име"
@@ -3601,7 +3625,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 "ОпиÑ"
@@ -4018,7 +4042,9 @@ msgstr "ОÑновен јазик"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
-msgstr "Јазик на веб-Ñтраницата ако прелиÑтувачот не може да го препознае Ñам"
+msgstr ""
+"Јазик на мрежното меÑто (веб-Ñтраницата) ако прелиÑтувачот не може да го "
+"препознае Ñам"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -4262,7 +4288,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"
@@ -4581,7 +4608,7 @@ msgstr ""
"за забелешките на овој кориÑник. Ðко не Ñакате да Ñе претплатите, едноÑтавно "
"кликнете на „Одбиј“"
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "Лиценца"
@@ -4712,18 +4739,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, "
@@ -4732,23 +4759,23 @@ 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 "
"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 "
@@ -4760,7 +4787,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 "
@@ -4769,20 +4796,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:779
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 "
@@ -4791,13 +4818,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 бајти"
@@ -4836,27 +4863,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."
@@ -4864,21 +4891,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5184,9 +5211,9 @@ msgid ""
"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
@@ -5296,7 +5323,7 @@ msgstr "Веб-Ñтраница"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:357
msgid "Design configuration"
-msgstr "Конфигурација на изгледот"
+msgstr "ПоÑтавки на изгледот"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:359
@@ -5473,11 +5500,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 "Менувањето на лозинка не е дозволено"
@@ -5571,14 +5598,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"
@@ -5596,7 +5623,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.
@@ -5784,9 +5811,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"
@@ -5798,7 +5825,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"
@@ -5922,7 +5949,7 @@ msgstr "Ознака"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr "Одберете ознака за да ја уточните лиÑтата"
+msgstr "Одберете ознака за да го ограничите ÑпиÑокот"
#: lib/galleryaction.php:143
msgid "Go"
@@ -6113,8 +6140,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"
@@ -6141,19 +6178,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"
@@ -6175,30 +6212,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 "
@@ -6226,13 +6263,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"
@@ -6266,13 +6303,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"
@@ -6303,7 +6340,7 @@ msgstr ""
"\n"
"%4$s\n"
"\n"
-"Погледнете лиÑта на омилените забелешки на %1$s тука:\n"
+"Погледнете ÑпиÑок на омилените забелешки на %1$s тука:\n"
"\n"
"%5$s\n"
"\n"
@@ -6311,7 +6348,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 +6359,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"
@@ -6369,7 +6406,7 @@ msgstr ""
"\n"
"%6$s\n"
"\n"
-"Еве лиÑта за Ñите @-одговори за ваÑ:\n"
+"Еве ÑпиÑок на Ñите @-одговори за ваÑ:\n"
"\n"
"%7$s\n"
"\n"
@@ -6391,7 +6428,7 @@ msgstr ""
"впуштите во разговор Ñо други кориÑници. Луѓето можат да ви иÑпраќаат пораки "
"што ќе можете да ги видите Ñамо Вие."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "од"
@@ -6472,7 +6509,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"
@@ -6553,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 "Забелешката е повторена"
@@ -6679,7 +6716,7 @@ msgstr "Дневен проÑек"
msgid "All groups"
msgstr "Сите групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ðеимплементиран метод."
@@ -6703,7 +6740,7 @@ msgstr "Избрани"
msgid "Popular"
msgstr "Популарно"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Ðема return-to аргументи."
@@ -6724,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 "Ðе е зададен кориÑник за еднокориÑничкиот режим."
@@ -6902,56 +6939,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "пред неколку Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "пред еден чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "пред %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
-msgstr "пред %d денови"
+msgstr "пред %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "пред еден меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "пред %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index c36addf55..1dca16e2b 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:41+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:20+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -84,24 +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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Ingen slik side."
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "Ingen slik bruker"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s og venner, side %2$d"
@@ -122,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -164,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -174,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -184,14 +184,14 @@ msgstr ""
"eller post en notis for å få hans eller hennes oppmerksomhet."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -202,22 +202,22 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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!"
@@ -227,12 +227,12 @@ msgstr "API-metode ikke funnet!"
#: 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:209
+#: 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."
@@ -264,7 +264,7 @@ msgstr "Klarte ikke å lagre profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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 +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:114
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."
@@ -391,119 +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
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid 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
+#: 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."
-#: 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"
@@ -518,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
@@ -594,8 +594,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -603,8 +603,8 @@ msgid "Nickname"
msgstr "Nick"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passord"
@@ -620,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:108
msgid "This method requires a POST or DELETE."
msgstr "Denne metoden krever en POST eller DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Du kan ikke slette statusen til en annen bruker."
@@ -641,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ikke funnet."
-#: actions/apistatusesupdate.php:316 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."
@@ -668,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:196 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:201 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!"
@@ -708,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!"
@@ -770,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"
@@ -810,11 +810,11 @@ msgstr "Avatar slettet."
msgid "You already blocked that user."
msgstr "Du har allerede blokkert den brukeren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukeren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -829,7 +829,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -838,7 +838,7 @@ msgstr "Nei"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ikke blokker denne brukeren"
@@ -847,7 +847,7 @@ msgstr "Ikke blokker denne brukeren"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -855,11 +855,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokker denne brukeren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Kunne ikke lagre blokkeringsinformasjon."
@@ -1020,7 +1020,7 @@ msgstr "Slett dette programmet"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ikke logget inn."
@@ -1051,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"
@@ -1468,7 +1468,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
@@ -1695,13 +1695,13 @@ msgstr "Bruker har allerede denne rollen."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil oppgitt."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med den ID'en."
@@ -1840,7 +1840,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"
@@ -2258,40 +2258,40 @@ msgstr "Du er ikke et medlem av den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s forlot gruppe %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allerede innlogget."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logg inn på nettstedet"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mistet eller glemt passordet?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2299,11 +2299,11 @@ msgstr ""
"Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
"endrer innstillingene dine."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Logg inn med brukernavn og passord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2509,30 +2509,30 @@ msgstr "Du har ikke tillatt noen programmer å bruke din konto."
msgid "Developers can edit the registration settings for their applications "
msgstr "Utviklere kan redigere registreringsinnstillingene for sine program "
-#: 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$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
#, php-format
msgid "Content type %s not supported."
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 "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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Ikke et støttet dataformat."
@@ -2637,7 +2637,7 @@ msgid "6 or more characters"
msgstr "6 eller flere tegn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bekreft"
@@ -2649,11 +2649,11 @@ msgstr "Samme som passord ovenfor"
msgid "Change"
msgstr "Endre"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 tegn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passordene var ikke like."
@@ -2877,43 +2877,43 @@ msgstr "Profilinformasjon"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt navn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmesiden"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beskriv degselv og dine interesser med %d tegn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beskriv degselv og dine interesser"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Om meg"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plassering"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
@@ -2956,7 +2956,7 @@ msgid ""
msgstr ""
"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks %d tegn)."
@@ -3217,7 +3217,7 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
msgid "Password and confirmation do not match."
msgstr "Passord og bekreftelse samsvarer ikke."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Feil ved innstilling av bruker."
@@ -3225,39 +3225,39 @@ msgstr "Feil ved innstilling av bruker."
msgid "New password successfully saved. You are now logged in."
msgstr "Nytt passord ble lagret. Du er nå logget inn."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Beklager, kun inviterte personer kan registrere seg."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Beklager, ugyldig invitasjonskode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrering vellykket"
-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrer"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrering ikke tillatt."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-postadressen finnes allerede."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3265,34 +3265,56 @@ msgstr ""
"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
"knytte deg til venner og kollegaer. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eller flere tegn. PÃ¥krevd."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samme som passord over. Kreves."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-post"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
-#: actions/register.php: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, "
@@ -3301,7 +3323,7 @@ msgstr ""
"Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3334,7 +3356,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.)"
@@ -3418,7 +3440,7 @@ msgstr "Du kan ikke gjenta din egen notis."
msgid "You already repeated that notice."
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"
@@ -3492,7 +3514,7 @@ msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet."
msgid "User doesn't have this role."
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"
@@ -3549,7 +3571,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"
@@ -3560,7 +3582,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"
@@ -4517,7 +4539,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"
@@ -4639,18 +4661,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, "
@@ -4659,11 +4681,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 "
@@ -4671,7 +4693,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 "
@@ -4679,39 +4701,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:779
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 ""
@@ -4754,45 +4776,45 @@ msgid "Could not update message with new URI."
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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5382,11 +5404,11 @@ 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"
@@ -5480,14 +5502,14 @@ msgstr "Fullt navn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Posisjon: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Hjemmeside: %s"
@@ -5982,8 +6004,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lytter nå til dine notiser på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6009,19 +6038,19 @@ msgstr ""
"Endre e-postadressen din eller dine varslingsvalg på %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadresse for posting til %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6043,30 +6072,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bekreft telefonnummeret ditt med denne koden:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt knuffet av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6094,13 +6123,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6134,13 +6163,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s /@%s) la din notis til som en favoritt"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6178,21 +6207,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"
@@ -6255,7 +6287,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"
@@ -6411,23 +6443,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 ""
-#: 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"
@@ -6537,7 +6569,7 @@ msgstr "Daglig gjennomsnitt"
msgid "All groups"
msgstr "Alle grupper"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ikke-implementert metode."
@@ -6562,7 +6594,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6583,7 +6615,7 @@ msgstr "Repeter denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6766,56 +6798,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "omtrent én time siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "omtrent én dag siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "omtrent én måned siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index f42b33941..c0e9cc411 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:47+0000\n"
+"POT-Creation-Date: 2010-05-27 22:55+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:27+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,14 +187,14 @@ msgstr ""
"een bericht sturen."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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."
@@ -205,22 +205,22 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -229,12 +229,12 @@ msgstr "De API-functie is niet aangetroffen."
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -611,8 +611,8 @@ msgstr ""
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -620,8 +620,8 @@ msgid "Nickname"
msgstr "Gebruikersnaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Wachtwoord"
@@ -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:108
msgid "This method requires a POST or DELETE."
msgstr "Deze methode vereist een POST of DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Niet aangetroffen."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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."
@@ -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"
@@ -1493,7 +1493,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
@@ -1726,13 +1726,13 @@ msgstr "Deze gebruiker heeft deze rol al."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Er is geen profiel opgegeven."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Er is geen profiel met dat ID."
@@ -1875,7 +1875,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 +2306,41 @@ msgstr "U bent geen lid van deze groep"
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U bent al aangemeld."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Wachtwoord kwijt of vergeten?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2348,11 +2348,11 @@ msgstr ""
"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
"invoeren alvorens u uw instellingen kunt wijzigen."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2565,30 +2565,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -2691,7 +2691,7 @@ msgid "6 or more characters"
msgstr "Zes of meer tekens"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bevestigen"
@@ -2703,11 +2703,11 @@ msgstr "Gelijk aan het wachtwoord hierboven"
msgid "Change"
msgstr "Wijzigen"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Het wachtwoord moet zes of meer tekens bevatten."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "De wachtwoorden komen niet overeen."
@@ -2934,43 +2934,43 @@ msgstr "Profielinformatie"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Thuispagina"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beschrijf uzelf en uw interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Beschrijving"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Locatie"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
@@ -3014,7 +3014,7 @@ msgstr ""
"Automatisch abonneren bij abonnement op mij (beste voor automatische "
"processen)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
@@ -3283,7 +3283,7 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
msgid "Password and confirmation do not match."
msgstr "Het wachtwoord en de bevestiging komen niet overeen."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
@@ -3291,39 +3291,39 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
msgid "New password successfully saved. You are now logged in."
msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Sorry. De uitnodigingscode is ongeldig."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3331,33 +3331,56 @@ msgstr ""
"Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
"mededelingen uitsturen en contact maken met vrienden en collega's. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Zes of meer tekens. Verplicht"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Een langere naam, mogelijk uw echte naam"
-#: actions/register.php: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, "
@@ -3367,7 +3390,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 "
@@ -3401,7 +3424,7 @@ msgstr ""
"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
"ervan verwacht."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3484,7 +3507,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"
@@ -3558,7 +3581,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"
@@ -3615,7 +3638,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"
@@ -3626,7 +3649,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"
@@ -4616,7 +4639,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"
@@ -4746,18 +4769,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, "
@@ -4766,11 +4789,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 "
@@ -4782,7 +4805,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 "
@@ -4794,7 +4817,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 "
@@ -4803,20 +4826,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:779
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 "
@@ -4825,13 +4848,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 ""
@@ -4871,31 +4894,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."
@@ -4903,16 +4926,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:967
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -4920,7 +4943,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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5516,11 +5539,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"
@@ -5615,14 +5638,14 @@ msgstr "Volledige naam: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Locatie: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Thuispagina: %s"
@@ -6165,8 +6188,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"
@@ -6192,19 +6224,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"
@@ -6226,30 +6258,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 "
@@ -6278,13 +6310,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"
@@ -6319,13 +6351,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"
@@ -6364,7 +6396,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"
@@ -6375,13 +6407,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"
@@ -6443,7 +6475,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"
@@ -6605,23 +6637,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"
@@ -6733,7 +6765,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."
@@ -6757,7 +6789,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."
@@ -6778,7 +6810,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."
@@ -6956,56 +6988,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index ddff42772..16cb56b4b 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:44+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:24+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,15 +185,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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!"
@@ -204,22 +204,22 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -229,12 +229,12 @@ msgstr "Fann ikkje API-metode."
#: 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:209
+#: 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."
@@ -266,7 +266,7 @@ msgstr "Kan ikkje lagra profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -606,8 +606,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -615,8 +615,8 @@ msgid "Nickname"
msgstr "Kallenamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passord"
@@ -633,11 +633,11 @@ msgstr "Alle"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Dette krev anten ein POST eller DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Finst ikkje."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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."
@@ -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"
@@ -1532,7 +1532,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
@@ -1770,13 +1770,13 @@ msgstr "Brukar har blokkert deg."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen vald profil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Fann ingen profil med den IDen."
@@ -1924,7 +1924,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"
@@ -2343,40 +2343,40 @@ msgstr "Du er ikkje medlem av den gruppa."
msgid "%1$s left group %2$s"
msgstr "%s forlot %s gruppa"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allereie logga inn."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Feil brukarnamn eller passord"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mista eller gløymd passord?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2384,12 +2384,12 @@ msgstr ""
"Skriv inn brukarnam og passord før du endrar innstillingar (av "
"tryggleiksomsyn)."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Log inn med brukarnamn og passord."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2602,31 +2602,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -2736,7 +2736,7 @@ msgid "6 or more characters"
msgstr "6 eller fleire teikn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Godta"
@@ -2748,11 +2748,11 @@ msgstr "Samme passord som over"
msgid "Change"
msgstr "Endra"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 teikn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passorda var ikkje like."
@@ -2989,44 +2989,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt namn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimeside"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Skriv om deg og interessene dine med 140 teikn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Skildra deg sjølv og din"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Om meg"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plassering"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
@@ -3069,7 +3069,7 @@ msgid ""
msgstr ""
"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
@@ -3321,7 +3321,7 @@ msgstr "Passord må vera 6 tekn eller meir."
msgid "Password and confirmation do not match."
msgstr "Passord og stadfesting stemmer ikkje."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
@@ -3329,75 +3329,97 @@ msgstr "Feil ved å setja brukar."
msgid "New password successfully saved. You are now logged in."
msgstr "Lagra det nye passordet. Du er logga inn."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Beklage, men kun inviterte kan registrere seg."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Feil med stadfestingskode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php: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, "
@@ -3406,7 +3428,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 "
@@ -3438,7 +3460,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.)"
@@ -3527,7 +3549,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"
@@ -3599,7 +3621,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."
@@ -3662,7 +3684,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"
@@ -3675,7 +3697,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"
@@ -4648,7 +4670,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."
@@ -4780,29 +4802,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 "
@@ -4810,7 +4832,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 "
@@ -4818,40 +4840,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:779
#, 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 ""
@@ -4895,27 +4917,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 "
@@ -4923,22 +4945,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5572,12 +5594,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"
@@ -5670,14 +5692,14 @@ msgstr "Fullt namn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Stad: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Heimeside: %s"
@@ -6168,8 +6190,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s høyrer no på notisane dine på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6191,7 +6220,7 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6199,13 +6228,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny epostadresse for å oppdatera %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6226,30 +6255,30 @@ msgstr ""
"Helsing frå %4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Ventar på godkjenning for dette telefonnummeret."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt dulta av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6266,13 +6295,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6292,13 +6321,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s la til di melding som ein favoritt"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6320,7 +6349,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6328,13 +6357,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6371,7 +6400,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å "
@@ -6531,25 +6560,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"
@@ -6663,7 +6692,7 @@ msgstr ""
msgid "All groups"
msgstr "Alle gruppar"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6687,7 +6716,7 @@ msgstr "Framheva"
msgid "Popular"
msgstr "Populære"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Manglar argumentet ID."
@@ -6711,7 +6740,7 @@ msgstr "Svar på denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ei liste over brukarane i denne gruppa."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6901,56 +6930,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index c816475e1..fb05a19a4 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:50+0000\n"
+"POT-Creation-Date: 2010-05-27 22:55+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:33+0000\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -191,14 +191,14 @@ msgstr ""
"szturchniesz użytkownika %s lub wyślesz wpis wymagającego jego uwagi."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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."
@@ -209,22 +209,22 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -233,12 +233,12 @@ msgstr "Nie odnaleziono metody API."
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -602,8 +602,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +611,8 @@ msgid "Nickname"
msgstr "Pseudonim"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Hasło"
@@ -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:108
msgid "This method requires a POST or DELETE."
msgstr "Ta metoda wymaga POST lub DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nie odnaleziono."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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ę."
@@ -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"
@@ -1475,7 +1475,7 @@ msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
@@ -1703,13 +1703,13 @@ msgstr "Użytkownik ma już tę rolę."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nie podano profilu."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Brak profilu o tym identyfikatorze."
@@ -1846,7 +1846,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 +2272,41 @@ msgstr "Nie jesteś członkiem tej grupy."
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj siÄ™"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Zaloguj siÄ™ na witrynie"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
"wiele osób."
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Zgubione lub zapomniane hasło?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2314,11 +2314,11 @@ msgstr ""
"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
"zmienianiem ustawień."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2524,30 +2524,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -2650,7 +2650,7 @@ msgid "6 or more characters"
msgstr "6 lub więcej znaków"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Potwierdź"
@@ -2662,11 +2662,11 @@ msgstr "Takie samo jak powyższe hasło"
msgid "Change"
msgstr "Zmień"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Hasło musi mieć sześć lub więcej znaków."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hasła nie pasują do siebie."
@@ -2893,43 +2893,43 @@ msgstr "Informacje o profilu"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "ImiÄ™ i nazwisko"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Opisz siÄ™ i swoje zainteresowania w %d znakach"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Opisz siÄ™ i swoje zainteresowania"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "O mnie"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Położenie"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
@@ -2972,7 +2972,7 @@ msgid ""
msgstr ""
"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
@@ -3233,7 +3233,7 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
msgid "Password and confirmation do not match."
msgstr "Hasło i potwierdzenie nie pasują do siebie."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
@@ -3241,40 +3241,40 @@ msgstr "Błąd podczas ustawiania użytkownika."
msgid "New password successfully saved. You are now logged in."
msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Tylko zaproszone osoby mogą się rejestrować."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Nieprawidłowy kod zaproszenia."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3282,34 +3282,56 @@ msgstr ""
"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
"wpisy i połączyć się z przyjaciółmi i kolegami. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 lub więcej znaków. Wymagane."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
-#: actions/register.php: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, "
@@ -3318,7 +3340,7 @@ msgstr ""
"Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
"danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3351,7 +3373,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.)"
@@ -3434,7 +3456,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"
@@ -3508,7 +3530,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"
@@ -3565,7 +3587,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"
@@ -3576,7 +3598,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"
@@ -4555,7 +4577,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"
@@ -4681,18 +4703,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, "
@@ -4701,11 +4723,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 "
@@ -4717,7 +4739,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 "
@@ -4730,7 +4752,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 "
@@ -4740,20 +4762,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:779
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 "
@@ -4762,13 +4784,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 ""
@@ -4809,27 +4831,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."
@@ -4837,21 +4859,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5447,11 +5469,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"
@@ -5545,14 +5567,14 @@ msgstr "ImiÄ™ i nazwisko: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Położenie: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Strona domowa: %s"
@@ -6092,8 +6114,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"
@@ -6119,19 +6151,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"
@@ -6153,30 +6185,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 "
@@ -6204,13 +6236,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"
@@ -6244,13 +6276,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"
@@ -6289,7 +6321,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"
@@ -6300,13 +6332,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"
@@ -6369,7 +6401,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"
@@ -6526,23 +6558,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"
@@ -6652,7 +6684,7 @@ msgstr "Dziennie średnio"
msgid "All groups"
msgstr "Wszystkie grupy"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Niezaimplementowana metoda."
@@ -6676,7 +6708,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."
@@ -6697,7 +6729,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."
@@ -6876,56 +6908,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "kilka sekund temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "około minutę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "około godzinę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "blisko dzień temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "około miesiąc temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 2d6571767..70e3788d8 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:53+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:37+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -85,24 +85,24 @@ 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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Página não foi encontrada."
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "Utilizador não foi encontrado."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:86
+#: actions/all.php:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amigos, página %2$d"
@@ -123,40 +123,40 @@ 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -166,7 +166,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -175,7 +175,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,14 +185,14 @@ msgstr ""
"publicar uma nota à sua atenção."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -203,22 +203,22 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -227,12 +227,12 @@ msgstr "Método da API não encontrado."
#: 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:209
+#: 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."
@@ -263,7 +263,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:222 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,42 +322,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:114
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."
@@ -391,119 +391,119 @@ 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 nomes alternativos! Máx. %d."
-#: actions/apigroupcreate.php:266
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%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 "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 "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
+#: 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."
-#: 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
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
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"
@@ -518,15 +518,15 @@ 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
@@ -594,8 +594,8 @@ msgstr ""
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -603,8 +603,8 @@ msgid "Nickname"
msgstr "Utilizador"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Senha"
@@ -620,11 +620,11 @@ msgstr "Permitir"
msgid "Allow or deny access to your account information."
msgstr "Permitir ou negar acesso à informação da sua conta."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Este método requer um POST ou DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Não pode apagar o estado de outro utilizador."
@@ -641,25 +641,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Não encontrado."
-#: actions/apistatusesupdate.php:316 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."
@@ -668,32 +668,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:196 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:201 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!"
@@ -708,12 +708,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 "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!"
@@ -770,7 +770,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"
@@ -810,11 +810,11 @@ msgstr "Avatar apagado."
msgid "You already blocked that user."
msgstr "Já bloqueou esse utilizador."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear utilizador"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -829,7 +829,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -838,7 +838,7 @@ msgstr "Não"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este utilizador"
@@ -847,7 +847,7 @@ msgstr "Não bloquear este utilizador"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -855,11 +855,11 @@ msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este utilizador"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
@@ -1020,7 +1020,7 @@ msgstr "Apagar esta aplicação"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Não iniciou sessão."
@@ -1051,7 +1051,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"
@@ -1474,7 +1474,7 @@ msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
@@ -1701,13 +1701,13 @@ msgstr "O utilizador já tem esta função."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Não foi especificado um perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Não foi encontrado um perfil com essa identificação."
@@ -1848,7 +1848,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"
@@ -2274,41 +2274,41 @@ msgstr "Não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sessão já foi iniciada."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de utilizador ou senha incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrar-me neste computador"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"De futuro, iniciar sessão automaticamente. Não usar em computadores "
"partilhados!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu-se da senha?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2316,11 +2316,11 @@ msgstr ""
"Por razões de segurança, por favor re-introduza o seu nome de utilizador e "
"senha antes de alterar as configurações."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Iniciar sessão com um nome de utilizador e senha."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2524,30 +2524,30 @@ 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
+#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
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
+#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
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 "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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2651,7 +2651,7 @@ msgid "6 or more characters"
msgstr "6 ou mais caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmação"
@@ -2663,11 +2663,11 @@ msgstr "Repita a senha nova"
msgid "Change"
msgstr "Modificar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Senha tem de ter 6 ou mais caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Senhas não coincidem."
@@ -2893,43 +2893,43 @@ msgstr "Informação do perfil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página pessoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descreva-se e aos seus interesses (máx. 140 caracteres)"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descreva-se e aos seus interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localidade"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está, por ex. \"Cidade, Região, País\""
@@ -2971,7 +2971,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografia demasiado extensa (máx. %d caracteres)."
@@ -3236,7 +3236,7 @@ msgstr "Senha tem de ter 6 ou mais caracteres."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
@@ -3244,39 +3244,39 @@ msgstr "Erro ao configurar utilizador."
msgid "New password successfully saved. You are now logged in."
msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpe, só pessoas convidadas se podem registar."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Desculpe, código de convite inválido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php: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
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3284,34 +3284,60 @@ msgstr ""
"Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
"ligar-se a amigos e colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou mais caracteres. Obrigatório."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Repita a senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correio"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
-#: actions/register.php:494
+#: 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, "
@@ -3321,7 +3347,7 @@ msgstr ""
"estes dados privados: senha, endereço de correio electrónico, endereço de "
"mensageiro instantâneo, número de telefone."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3354,7 +3380,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.)"
@@ -3437,7 +3463,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"
@@ -3511,7 +3537,7 @@ msgstr "Não pode retirar funções aos utilizadores neste site."
msgid "User doesn't have this role."
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"
@@ -3568,7 +3594,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"
@@ -3579,7 +3605,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"
@@ -4555,7 +4581,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"
@@ -4684,18 +4710,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, "
@@ -4704,11 +4730,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 "
@@ -4720,7 +4746,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 "
@@ -4731,7 +4757,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 "
@@ -4740,20 +4766,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:779
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 "
@@ -4762,13 +4788,13 @@ 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."
@@ -4807,27 +4833,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
+#: 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."
@@ -4835,21 +4861,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:967
+#: classes/Notice.php:973
msgid "Problem saving group inbox."
msgstr "Problema na gravação da caixa de entrada do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5444,11 +5470,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"
@@ -5542,14 +5568,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Página pessoal: %s"
@@ -6082,8 +6108,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está agora a ouvir as suas notas em %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6110,19 +6143,19 @@ msgstr ""
"8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço electrónico para publicar no site %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6144,30 +6177,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmação SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirme que este número de telefone é seu com este código:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s envia-lhe um toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6195,13 +6228,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem privada de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6235,13 +6268,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) adicionou a sua nota às favoritas."
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6279,7 +6312,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6290,13 +6323,13 @@ msgstr ""
"\n"
"\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma nota à sua atenção"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6359,7 +6392,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"
@@ -6519,23 +6552,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"
@@ -6645,7 +6678,7 @@ msgstr "Média diária"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6669,7 +6702,7 @@ msgstr "Destaques"
msgid "Popular"
msgstr "Populares"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sem argumentos return-to."
@@ -6690,7 +6723,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Retirar a função \"%s\" a este utilizador"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nenhum utilizador único definido para o modo de utilizador único."
@@ -6868,56 +6901,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "há alguns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "há cerca de um minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "há cerca de uma hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "há cerca de um dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "há cerca de um mês"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 1409dc614..56bdb97a0 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:56+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:40+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -87,24 +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:65 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Esta página não existe."
-#: actions/all.php:75 actions/allrss.php:68
+#: actions/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 "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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s e amigos, pág. %2$d"
@@ -125,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
@@ -159,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:140
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -169,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:143
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
@@ -179,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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -189,14 +189,14 @@ msgstr ""
"atenção de %s ou publicar uma mensagem para sua atenção."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -207,22 +207,22 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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!"
@@ -231,12 +231,12 @@ msgstr "O método da API não foi encontrado!"
#: 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:209
+#: 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."
@@ -268,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:222 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 "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:114
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."
@@ -396,121 +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
+#: actions/apigroupcreate.php:267
#, php-format
msgid "Invalid alias: \"%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
+#: 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."
-#: 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
+#: actions/apigrouplist.php:108
#, php-format
msgid "%1$s groups %2$s is a member of."
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"
@@ -525,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
@@ -607,8 +607,8 @@ msgstr ""
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -616,8 +616,8 @@ msgid "Nickname"
msgstr "Usuário"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Senha"
@@ -633,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:108
msgid "This method requires a POST or DELETE."
msgstr "Esse método requer um POST ou DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "Você não pode excluir uma mensagem de outro usuário."
@@ -654,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Não encontrado."
-#: actions/apistatusesupdate.php:316 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"
@@ -681,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:196 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:201 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!"
@@ -721,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!"
@@ -784,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"
@@ -824,11 +824,11 @@ msgstr "O avatar foi excluído."
msgid "You already blocked that user."
msgstr "Você já bloqueou esse usuário."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuário"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -844,7 +844,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -853,7 +853,7 @@ msgstr "Não"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este usuário"
@@ -862,7 +862,7 @@ msgstr "Não bloquear este usuário"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -870,11 +870,11 @@ msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuário"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
@@ -1035,7 +1035,7 @@ msgstr "Excluir esta aplicação"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Você não está autenticado."
@@ -1066,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"
@@ -1488,7 +1488,7 @@ msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
@@ -1717,13 +1717,13 @@ msgstr "O usuário já possui este papel."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Não foi especificado nenhum perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Não foi encontrado nenhum perfil com esse ID."
@@ -1865,7 +1865,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"
@@ -2293,42 +2293,42 @@ msgstr "Você não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Já está autenticado."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de usuário e/ou senha incorreto(s)."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erro na configuração do usuário. Você provavelmente não tem autorização."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
"computadores compartilhados!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu sua senha?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2336,11 +2336,11 @@ msgstr ""
"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
"senha antes de alterar suas configurações."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Autentique-se com seu nome de usuário e senha."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2551,31 +2551,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -2680,7 +2679,7 @@ msgid "6 or more characters"
msgstr "No mínimo 6 caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2692,11 +2691,11 @@ msgstr "Igual à senha acima"
msgid "Change"
msgstr "Alterar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "A senha deve ter, no mínimo, 6 caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "As senhas não coincidem."
@@ -2726,24 +2725,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."
@@ -2884,9 +2883,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
@@ -2894,9 +2893,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
@@ -2923,43 +2921,43 @@ msgstr "Informações do perfil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL do seu site, blog ou perfil em outro site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descreva a si mesmo e os seus interesses em %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descreva a si mesmo e os seus interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Descrição"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localização"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
@@ -3002,7 +3000,7 @@ msgid ""
msgstr ""
"Assinar automaticamente à quem me assinar (melhor para perfis não humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "A descrição é muito extensa (máximo %d caracteres)."
@@ -3042,9 +3040,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."
@@ -3266,7 +3264,7 @@ msgstr "A senha deve ter 6 ou mais caracteres."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
@@ -3276,40 +3274,39 @@ msgstr ""
"A nova senha foi salva com sucesso. A partir de agora você já está "
"autenticado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpe, mas somente convidados podem se registrar."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Desculpe, mas o código do convite é inválido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3317,43 +3314,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 "
@@ -3386,7 +3408,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.)"
@@ -3468,7 +3490,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"
@@ -3543,7 +3565,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"
@@ -3600,7 +3622,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"
@@ -3611,7 +3633,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"
@@ -3971,7 +3993,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."
@@ -4064,7 +4085,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."
@@ -4099,9 +4119,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
@@ -4125,7 +4144,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"
@@ -4142,9 +4160,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
@@ -4157,9 +4174,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
@@ -4197,9 +4213,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.
@@ -4209,9 +4224,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
@@ -4262,9 +4276,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"
@@ -4497,9 +4510,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"
@@ -4597,7 +4609,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"
@@ -4728,18 +4740,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, "
@@ -4748,11 +4760,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 "
@@ -4764,7 +4776,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 "
@@ -4776,7 +4788,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 "
@@ -4785,20 +4797,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:779
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 "
@@ -4807,12 +4819,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."
@@ -4851,27 +4863,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."
@@ -4879,21 +4891,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5176,7 +5188,7 @@ 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
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5232,7 +5244,7 @@ msgstr ""
#: lib/action.php:871
#, 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
@@ -5444,25 +5456,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"
@@ -5490,11 +5499,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"
@@ -5576,9 +5585,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
@@ -5588,14 +5597,14 @@ msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Localização: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Site: %s"
@@ -5618,10 +5627,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.
@@ -6132,8 +6141,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"
@@ -6159,19 +6178,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"
@@ -6193,30 +6212,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 "
@@ -6244,13 +6265,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"
@@ -6284,13 +6305,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"
@@ -6328,21 +6349,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"
@@ -6368,6 +6392,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."
@@ -6382,7 +6429,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"
@@ -6544,23 +6591,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"
@@ -6670,7 +6717,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."
@@ -6694,7 +6741,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."
@@ -6715,7 +6762,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."
@@ -6893,56 +6940,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 054ed2bc2..81cfe0aad 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:18:59+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:43+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -28,7 +28,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
msgid "Access"
-msgstr "ПринÑÑ‚ÑŒ"
+msgstr "ДоÑтуп"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -189,14 +189,14 @@ msgstr ""
"s или отправить запиÑÑŒ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ?"
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -207,22 +207,22 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 не найден."
@@ -231,12 +231,12 @@ msgstr "Метод API не найден."
#: 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:209
+#: 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."
@@ -268,7 +268,7 @@ msgstr "Ðе удаётÑÑ Ñохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -606,8 +606,8 @@ msgstr ""
msgid "Account"
msgstr "ÐаÑтройки"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -615,8 +615,8 @@ msgid "Nickname"
msgstr "ИмÑ"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -632,11 +632,11 @@ msgstr "Разрешить"
msgid "Allow or deny access to your account information."
msgstr "Разрешить или запретить доÑтуп к информации вашей учётной запиÑи."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Этот метод требует POST или DELETE."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе найдено."
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° %s"
-#: actions/apitimelinepublic.php:201 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 "Ðе удаётÑÑ Ñохранить информацию о блокировании."
@@ -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 "Удалить Ñту запиÑÑŒ"
@@ -1492,7 +1492,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðе удаётÑÑ Ñтандартизировать Ñтот Ñлектронный адреÑ"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ðеверный Ñлектронный адреÑ."
@@ -1720,13 +1720,13 @@ msgstr "Пользователь уже имеет Ñту роль."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Профиль не определен."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðет Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID."
@@ -1867,7 +1867,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 +2295,39 @@ msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы."
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ð’Ñ‹ уже авторизовалиÑÑŒ."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Ðекорректное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка уÑтановки пользователÑ. Ð’Ñ‹, вероÑтно, не авторизованы."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "ÐвторизоватьÑÑ"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запомнить менÑ"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "ÐвтоматичеÑкии входить в дальнейшем. Ðе Ð´Ð»Ñ Ð¾Ð±Ñ‰ÐµÐ´Ð¾Ñтупных компьютеров!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "ПотерÑли или забыли пароль?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2335,11 +2335,11 @@ msgstr ""
"По причинам ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти введите Ð¸Ð¼Ñ Ð¸ пароль ещё раз, прежде чем "
"изменÑÑ‚ÑŒ Ваши уÑтановки."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Войти Ñ Ð²Ð°ÑˆÐ¸Ð¼ именем учаÑтника и паролем."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2545,30 +2545,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Ðеподдерживаемый формат данных."
@@ -2673,7 +2673,7 @@ msgid "6 or more characters"
msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Подтверждение"
@@ -2685,11 +2685,11 @@ msgstr "Тот же пароль, что и выше"
msgid "Change"
msgstr "Изменить"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Пароль должен быть длиной не менее 6 Ñимволов."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Пароли не Ñовпадают."
@@ -2764,7 +2764,7 @@ msgstr "Путь к Ñайту"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr "ПуÑÑ‚ÑŒ к локализациÑм"
+msgstr "Путь к локализациÑм"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
@@ -2913,43 +2913,43 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 латинÑких Ñтрочных буквы или цифры, без пробелов"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Полное имÑ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ГлавнаÑ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ÐÐ´Ñ€ÐµÑ Ñ‚Ð²Ð¾ÐµÐ¹ Ñтраницы, дневника или Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð½Ð° другом портале"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишите ÑÐµÐ±Ñ Ð¸ Ñвои ÑƒÐ²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ помощи %d Ñимволов"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишите ÑÐµÐ±Ñ Ð¸ Ñвои интереÑÑ‹"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "БиографиÑ"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "МеÑтораÑположение"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Где вы находитеÑÑŒ, например «Город, облаÑÑ‚ÑŒ, Ñтрана»"
@@ -2991,7 +2991,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "ÐвтоматичеÑки подпиÑыватьÑÑ Ð½Ð° вÑех, кто подпиÑалÑÑ Ð½Ð° менÑ"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð±Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ (макÑимум %d Ñимволов)."
@@ -3251,7 +3251,7 @@ msgstr "Пароль должен быть длиной не менее 6 Ñим
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не Ñовпадают."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Ошибка в уÑтановках пользователÑ."
@@ -3259,41 +3259,41 @@ msgstr "Ошибка в уÑтановках пользователÑ."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовый пароль уÑпешно Ñохранён. Ð’Ñ‹ авторизовалиÑÑŒ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "ПроÑтите, региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ по приглашению."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Извините, неверный приглаÑительный код."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÑпешна!"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3302,34 +3302,58 @@ msgstr ""
"получите возможноÑÑ‚ÑŒ публиковать короткие ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ уÑтанавливать ÑвÑзи Ñ "
"друзьÑми и коллегами. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 латинÑких Ñтрочных букв или цифр, без пробелов. ОбÑзательное поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 или более Ñимволов. ОбÑзательное поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Тот же пароль что и Ñверху. ОбÑзательное поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Ðужна только Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹, оÑведомлений и воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Полное имÑ, предпочтительно Ваше наÑтоÑщее имÑ"
-#: actions/register.php: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, "
@@ -3338,7 +3362,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 "
@@ -3372,7 +3396,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.)"
@@ -3451,7 +3475,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,7 +3549,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"
@@ -3583,7 +3607,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 "ИмÑ"
@@ -3594,7 +3618,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 "ОпиÑание"
@@ -4500,7 +4524,7 @@ msgstr "Пользователь"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr "ПользовательÑкие наÑтройки Ð´Ð»Ñ Ñтого Ñайта StatusNet."
+msgstr "ÐаÑтройки Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ñтого Ñайта StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
@@ -4576,7 +4600,7 @@ msgstr ""
"подпиÑатьÑÑ Ð½Ð° запиÑи Ñтого пользователÑ. ЕÑли Ð’Ñ‹ Ñтого не хотите делать, "
"нажмите «Отказ»."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "ЛицензиÑ"
@@ -4704,18 +4728,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, "
@@ -4724,11 +4748,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 "
@@ -4740,7 +4764,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 "
@@ -4752,7 +4776,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 "
@@ -4761,20 +4785,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:779
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 "
@@ -4783,12 +4807,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 байта."
@@ -4827,27 +4851,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."
@@ -4855,21 +4879,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5089,7 +5113,7 @@ msgstr "ПоиÑк"
#. TRANS: Menu item for site administration
#: lib/action.php:515 lib/adminpanelaction.php:399
msgid "Site notice"
-msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "Уведомление Ñайта"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:582
@@ -5463,11 +5487,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 "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ разрешена"
@@ -5561,14 +5585,14 @@ msgstr "Полное имÑ: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "МеÑтораÑположение: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "ДомашнÑÑ Ñтраница: %s"
@@ -6106,8 +6130,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s теперь Ñледит за вашими запиÑÑми на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6133,19 +6164,19 @@ msgstr ""
"Измените email-Ð°Ð´Ñ€ÐµÑ Ð¸ наÑтройки уведомлений на %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "БиографиÑ: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ðовый Ñлектронный Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ñтинга %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6167,30 +6198,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s ÑтатуÑ"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Подтверждение СМС"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s. Подтвердите, что Ñто ваш телефон, Ñледующим кодом:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Ð’Ð°Ñ Â«Ð¿Ð¾Ð´Ñ‚Ð¾Ð»ÐºÐ½ÑƒÐ»Â» пользователь %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6218,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"
@@ -6258,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"
@@ -6302,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"
@@ -6313,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"
@@ -6381,7 +6412,7 @@ msgstr ""
"Ð²Ð¾Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей в разговор. СообщениÑ, получаемые от других "
"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "от "
@@ -6540,23 +6571,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 "ЗапиÑÑŒ повторена"
@@ -6666,7 +6697,7 @@ msgstr "СреднеÑуточнаÑ"
msgid "All groups"
msgstr "Ð’Ñе группы"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ðереализованный метод."
@@ -6690,7 +6721,7 @@ msgstr "ОÑобые"
msgid "Popular"
msgstr "ПопулÑрное"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Ðет аргумента return-to."
@@ -6711,7 +6742,7 @@ msgstr "Повторить Ñту запиÑÑŒ"
msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ€Ð¾Ð»ÑŒ «%s»"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ðи задан пользователь Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого режима."
@@ -6889,56 +6920,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "пару Ñекунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "около чаÑа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "около %d чаÑа(ов) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "около меÑÑца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑца(ев) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index caa8258f9..789e4bc86 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-03 19:17+0000\n"
+"POT-Creation-Date: 2010-06-03 23:00+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"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr ""
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -174,14 +174,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 ""
@@ -192,22 +192,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 ""
@@ -216,12 +216,12 @@ msgstr ""
#: 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:209
+#: 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 ""
@@ -251,7 +251,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -575,8 +575,8 @@ msgstr ""
msgid "Account"
msgstr ""
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -584,8 +584,8 @@ msgid "Nickname"
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr ""
@@ -601,11 +601,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr ""
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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 ""
@@ -1436,7 +1436,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1655,13 +1655,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1795,7 +1795,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 +2167,49 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr ""
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr ""
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr ""
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr ""
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr ""
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2404,30 +2404,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2530,7 +2530,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr ""
@@ -2542,11 +2542,11 @@ msgstr ""
msgid "Change"
msgstr ""
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr ""
@@ -2766,43 +2766,43 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr ""
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr ""
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr ""
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr ""
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2842,7 +2842,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3086,7 +3086,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3094,78 +3094,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php: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 "
@@ -3184,7 +3206,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.)"
@@ -3259,7 +3281,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 ""
@@ -3327,7 +3349,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 ""
@@ -3384,7 +3406,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 ""
@@ -3395,7 +3417,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 ""
@@ -4307,7 +4329,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4428,29 +4450,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 "
@@ -4458,7 +4480,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 "
@@ -4466,39 +4488,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:779
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 ""
@@ -4537,45 +4559,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5157,11 +5179,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 ""
@@ -5252,14 +5274,14 @@ msgstr ""
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5735,8 +5757,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5752,19 +5781,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr ""
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5778,30 +5807,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5818,13 +5847,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5844,13 +5873,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5872,7 +5901,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5880,13 +5909,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5923,7 +5952,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 ""
@@ -6077,23 +6106,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 ""
@@ -6203,7 +6232,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6227,7 +6256,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6248,7 +6277,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6426,56 +6455,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index e50bf1a32..4f0a06945 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:02+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:47+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,14 +185,14 @@ msgstr ""
"%s eller skriva en notis för hans eller hennes uppmärksamhet."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -203,22 +203,22 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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."
@@ -227,12 +227,12 @@ msgstr "API-metod hittades inte."
#: 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:209
+#: 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."
@@ -262,7 +262,7 @@ msgstr "Kunde inte spara profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -592,8 +592,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -601,8 +601,8 @@ msgid "Nickname"
msgstr "Smeknamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Lösenord"
@@ -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:108
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:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Hittades inte."
-#: actions/apistatusesupdate.php:316 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:196 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:201 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."
@@ -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"
@@ -1470,7 +1470,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den e-postadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
@@ -1698,13 +1698,13 @@ msgstr "Användaren har redan denna roll."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil angiven."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med det ID:t."
@@ -1844,7 +1844,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 +2271,39 @@ msgstr "Du är inte en medlem i den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s lämnade grupp %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Redan inloggad."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Felaktigt användarnamn eller lösenord."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Tappat bort eller glömt ditt lösenord?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2311,11 +2311,11 @@ msgstr ""
"Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
"igen innan du ändrar dina inställningar."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Logga in med ditt användarnamn och lösenord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2523,30 +2523,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -2649,7 +2649,7 @@ msgid "6 or more characters"
msgstr "Minst 6 tecken"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bekräfta"
@@ -2661,11 +2661,11 @@ msgstr "Samma som lösenordet ovan"
msgid "Change"
msgstr "Ändra"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Lösenorden matchar inte."
@@ -2890,43 +2890,43 @@ msgstr "Profilinformation"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullständigt namn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hemsida"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beskriv dig själv och dina intressen med högst 140 tecken"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beskriv dig själv och dina intressen"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografi"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plats"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Var du håller till, såsom \"Stad, Län, Land\""
@@ -2970,7 +2970,7 @@ msgstr ""
"Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
"människa) "
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max %d tecken)."
@@ -3232,7 +3232,7 @@ msgstr "Lösenordet måste vara minst 6 tecken."
msgid "Password and confirmation do not match."
msgstr "Lösenord och bekräftelse matchar inte."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
@@ -3240,39 +3240,39 @@ msgstr "Fel uppstog i användarens inställning"
msgid "New password successfully saved. You are now logged in."
msgstr "Nya lösenordet sparat. Du är nu inloggad."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Tyvärr, ogiltig inbjudningskod."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3280,37 +3280,60 @@ msgstr ""
"Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
"och ansluta till vänner och kollegor. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
"i."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Minst 6 tecken. MÃ¥ste fyllas i."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-post"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Används endast för uppdateringar, tillkännagivanden och återskapande av "
"lösenord"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
-#: actions/register.php: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, "
@@ -3319,7 +3342,7 @@ msgstr ""
"Mina texter och filer är tillgängliga under %s med undantag av den här "
"privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
-#: actions/register.php:542
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3352,7 +3375,7 @@ msgstr ""
"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
"denna tjänst."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3435,7 +3458,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"
@@ -3509,7 +3532,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"
@@ -3566,7 +3589,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"
@@ -3577,7 +3600,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"
@@ -4552,7 +4575,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"
@@ -4681,18 +4704,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, "
@@ -4701,11 +4724,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 "
@@ -4717,7 +4740,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 "
@@ -4729,7 +4752,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 "
@@ -4738,20 +4761,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:779
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 "
@@ -4760,12 +4783,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."
@@ -4804,27 +4827,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."
@@ -4832,21 +4855,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5436,11 +5459,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"
@@ -5534,14 +5557,14 @@ msgstr "Fullständigt namn: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "Plats: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Hemsida: %s"
@@ -6072,8 +6095,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lyssnar nu på dina notiser på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6099,19 +6129,19 @@ msgstr ""
"Ändra din e-postadress eller notiferingsinställningar på %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadress för att skicka till %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6133,30 +6163,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bekräftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bekräfta detta telefonnummer med denna kod:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blivit knuffad av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6184,13 +6214,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nytt privat meddelande från %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6224,13 +6254,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) lade till din notis som en favorit"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6268,7 +6298,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6279,13 +6309,13 @@ msgstr ""
"\n"
"\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6347,7 +6377,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"
@@ -6507,23 +6537,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"
@@ -6633,7 +6663,7 @@ msgstr "Dagligt genomsnitt"
msgid "All groups"
msgstr "Alla grupper"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Inte implementerad metod."
@@ -6657,7 +6687,7 @@ msgstr "Profilerade"
msgid "Popular"
msgstr "Populärt"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Inga \"return-to\"-argument."
@@ -6678,7 +6708,7 @@ msgstr "Upprepa denna notis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Återkalla rollen \"%s\" från denna användare"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ingen enskild användare definierad för enanvändarläge."
@@ -6856,56 +6886,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "för nån minut sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "för en timma sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "för en dag sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "för en månad sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 7084c9114..aef7a14b1 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-29 23:21+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:06+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:51+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడౠ(ఆటమà±)"
#. TRANS: %1$s is user nickname
-#: actions/all.php:134
+#: actions/all.php:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -177,14 +177,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 మరియౠసà±à°¨à±‡à°¹à°¿à°¤à±à°² à°¨à±à°‚à°¡à°¿ తాజాకరణలà±!"
@@ -195,22 +195,22 @@ msgstr "%2$sలో %1$s మరియౠసà±à°¨à±‡à°¹à°¿à°¤à±à°² à°¨à±à°‚à°¡
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±."
@@ -220,12 +220,12 @@ msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±."
#: 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:209
+#: 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 ""
@@ -257,7 +257,7 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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 "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ తొలగించలేకపోయాం."
@@ -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
@@ -587,8 +587,8 @@ msgstr ""
msgid "Account"
msgstr "ఖాతా"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -596,8 +596,8 @@ msgid "Nickname"
msgstr "పేరà±"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "సంకేతపదం"
@@ -613,11 +613,11 @@ msgstr "à°…à°¨à±à°®à°¤à°¿à°‚à°šà±"
msgid "Allow or deny access to your account information."
msgstr "మీ ఖాతా సమాచారానà±à°¨à°¿ సంపà±à°°à°¾à°ªà°¿à°‚చడానికి à°…à°¨à±à°®à°¤à°¿à°‚à°šà°‚à°¡à°¿ లేదా నిరాకరించండి."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "కనబడలేదà±."
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s బహిరంగ కాలరేఖ"
-#: actions/apitimelinepublic.php:201 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 "తొలగించà±"
@@ -805,11 +805,11 @@ msgstr "అవతారానà±à°¨à°¿ తొలగించాం."
msgid "You already blocked that user."
msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించారà±."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -823,7 +823,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -832,7 +832,7 @@ msgstr "కాదà±"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించకà±"
@@ -841,7 +841,7 @@ msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించకà±"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -849,11 +849,11 @@ msgid "Yes"
msgstr "à°…à°µà±à°¨à±"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "నిరోధపౠసమాచారానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో విఫలమయà±à°¯à°¾à°‚."
@@ -901,9 +901,9 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "%s పై à°—à±à°‚à°ªà±à°²à±"
+msgstr "%sà°•à°¿ టపాచెయà±à°¯à°¿"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -1015,7 +1015,7 @@ msgstr "à°ˆ ఉపకరణానà±à°¨à°¿ తొలగించà±"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చలేదà±."
@@ -1044,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 "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±"
@@ -1270,9 +1270,8 @@ msgid "Callback URL is not valid."
msgstr ""
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
+msgstr "ఉపకరణానà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
#: actions/editgroup.php:56
#, php-format
@@ -1462,7 +1461,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±:"
@@ -1683,13 +1682,13 @@ msgstr "వాడà±à°•à°°à°¿à°•à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°ˆ పాతà±à°°
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1827,7 +1826,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 కాలరేఖ"
@@ -2235,50 +2234,50 @@ msgstr "మీరౠఆ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±
msgid "%1$s left group %2$s"
msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "ఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం తపà±à°ªà±."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "వాడà±à°•à°°à°¿à°¨à°¿ అమరà±à°šà°¡à°‚లో పొరపాటà±. బహà±à°¶à°¾ మీకౠఅధీకరణ లేకపోవచà±à°šà±."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ననà±à°¨à± à°—à±à°°à±à°¤à±à°‚à°šà±à°•à±‹"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిషà±à°¯à°¤à±à°¤à±à°²à±‹ ఆటోమెటిగà±à°—à°¾ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±; బయటి à°•à°‚à°ªà±à°¯à±‚à°°à±à°² కొరకౠకాదà±!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "మీ సంకేతపదం మరà±à°šà°¿à°ªà±‹à°¯à°¾à°°à°¾?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"à°­à°¦à±à°°à°¤à°¾ కారణాల దృషà±à°Ÿà±à°¯à°¾, అమరికలౠమారà±à°šà±‡ à°®à±à°‚దౠమీ వాడà±à°•à°°à°¿ పేరà±à°¨à°¿ మరియౠసంకేతపదానà±à°¨à°¿ మరోసారి ఇవà±à°µà°‚à°¡à°¿."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "మీ వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2350,7 +2349,7 @@ msgstr "విషయం లేదà±!"
#: actions/newmessage.php:158
msgid "No recipient specified."
-msgstr ""
+msgstr "ఎవరికి పంపించాలో పేరà±à°•à±Šà°¨à°²à±‡à°¦à±."
#: actions/newmessage.php:164 lib/command.php:484
msgid ""
@@ -2460,7 +2459,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."
@@ -2479,31 +2478,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 "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
+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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2611,7 +2609,7 @@ msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "నిరà±à°¥à°¾à°°à°¿à°‚à°šà±"
@@ -2623,11 +2621,11 @@ msgstr "పై సంకేతపదం వలెనే"
msgid "Change"
msgstr "మారà±à°šà±"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "సంకేతపదం తపà±à°ªà°¨à°¿à°¸à°°à°¿à°—à°¾ 6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±à°‚డాలి."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "సంకేతపదాలౠసరిపోలలేదà±."
@@ -2858,43 +2856,43 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à± సమాచారం"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 à°šà°¿à°¨à±à°¨à°¬à°¡à°¿ à°…à°•à±à°·à°°à°¾à°²à± లేదా అంకెలà±, విరామచిహà±à°¨à°¾à°²à± మరియౠఖాళీలౠతపà±à°ª"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "పూరà±à°¤à°¿ పేరà±"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "హోమౠపేజీ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ %d à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ చెపà±à°ªà°‚à°¡à°¿"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "à°ªà±à°°à°¾à°‚తం"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "మీరౠఎకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, \"నగరం, రాషà±à°Ÿà±à°°à°‚ (లేదా à°ªà±à°°à°¾à°‚తం), దేశం\""
@@ -2934,7 +2932,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚ చాలా పెదà±à°¦à°—à°¾ ఉంది (%d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
@@ -3183,7 +3181,7 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే à°Žà°•à±à
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియౠనిరà±à°§à°¾à°°à°£ సరిపోలేదà±."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3191,78 +3189,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 "
@@ -3293,7 +3315,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.)"
@@ -3314,7 +3336,7 @@ msgstr ""
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "à°¸à±à°¦à±‚à°° చందా"
#: actions/remotesubscribe.php:124
#, fuzzy
@@ -3327,7 +3349,7 @@ msgstr "వాడà±à°•à°°à°¿ పేరà±"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "మీరౠఅనà±à°¸à°°à°¿à°‚చాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨ వాడà±à°•à°°à°¿ యొకà±à°• à°®à±à°¦à±à°¦à±à°ªà±‡à°°à±"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
@@ -3375,7 +3397,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 "సృషà±à°Ÿà°¿à°¤à°‚"
@@ -3445,11 +3467,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 "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±"
@@ -3509,7 +3530,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 "పేరà±"
@@ -3520,7 +3541,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 "వివరణ"
@@ -3594,9 +3615,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
@@ -4462,7 +4483,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "లైసెనà±à°¸à±"
@@ -4583,29 +4604,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 "
@@ -4613,7 +4634,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 "
@@ -4621,39 +4642,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:779
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 ""
@@ -4692,48 +4713,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 "అవతారానà±à°¨à°¿ పెటà±à°Ÿà°¡à°‚లో పొరపాటà±"
-#: 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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4842,7 +4861,7 @@ msgstr "శీరà±à°·à°¿à°•à°²à±‡à°¨à°¿ పేజీ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
#: lib/action.php:426
msgid "Primary site navigation"
-msgstr ""
+msgstr "à°ªà±à°°à°¾à°§à°®à°¿à°• సైటౠమారà±à°—దరà±à°¶à°¿à°¨à°¿"
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:432
@@ -4858,7 +4877,6 @@ msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•à±‹à°‚à°¡à°¿"
@@ -4975,9 +4993,8 @@ msgstr "పేజీ గమనిక"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:752
-#, fuzzy
msgid "Secondary site navigation"
-msgstr "చందాలà±"
+msgstr "à°¦à±à°µà°¿à°¤à±€à°¯ సైటౠమారà±à°—దరà±à°¶à°¿à°¨à°¿"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
#: lib/action.php:758
@@ -5025,13 +5042,13 @@ msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసà
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, 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
@@ -5339,12 +5356,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 "సంకేతపదం మారà±à°ªà±"
@@ -5362,9 +5379,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
@@ -5413,7 +5429,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"
@@ -5429,9 +5445,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
@@ -5441,14 +5457,14 @@ msgstr "పూరà±à°¤à°¿à°ªà±‡à°°à±: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "à°ªà±à°°à°¾à°‚తం: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "హోంపేజీ: %s"
@@ -5939,8 +5955,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ఇపà±à°ªà±à°¡à± %2$sలో మీ నోటీసà±à°²à°¨à°¿ వింటà±à°¨à±à°¨à°¾à°°à±."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5966,19 +5989,19 @@ msgstr ""
"మీ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°¨à°¿ లేదా గమనింపà±à°² ఎంపికలనౠ%8$s వదà±à°¦ మారà±à°šà±à°•à±‹à°‚à°¡à°¿\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%sà°•à°¿ నోటీసà±à°²à± పంపించడానికి కొతà±à°¤ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5992,30 +6015,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s à°¸à±à°¥à°¿à°¤à°¿"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "à°ˆ ఫోనౠనంబరౠయొకà±à°• నిరà±à°§à°¾à°°à°£à°•à±ˆ వేచివà±à°‚ది."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6043,13 +6066,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s à°¨à±à°‚à°¡à°¿ కొతà±à°¤ అంతరంగిక సందేశం"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6083,13 +6106,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) మీ నోటీసà±à°¨à°¿ ఇషà±à°Ÿà°ªà°¡à±à°¡à°¾à°°à±"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6127,7 +6150,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6138,13 +6161,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) మీకౠఒక నోటీసà±à°¨à°¿ పంపించారà±"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6205,7 +6228,7 @@ msgstr ""
"మీకౠఅంతరంగిక సందేశాలౠలేవà±. ఇతర వాడà±à°•à°°à±à°²à°¤à±‹ సంభాషణకై మీరౠవారికి అంతరంగిక సందేశాలౠ"
"పంపించవచà±à°šà±. మీ à°•à°‚à°Ÿà°¿à°•à°¿ మాతà±à°°à°®à±‡ కనబడేలా వారౠమీకౠసందేశాలౠపంపవచà±à°šà±."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "à°¨à±à°‚à°¡à°¿"
@@ -6363,27 +6386,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"
@@ -6493,7 +6515,7 @@ msgstr "రోజà±à°µà°¾à°°à±€ సగటà±"
msgid "All groups"
msgstr "à°…à°¨à±à°¨à°¿ à°—à±à°‚à°ªà±à°²à±"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6517,7 +6539,7 @@ msgstr "విశేషం"
msgid "Popular"
msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯à°‚"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±."
@@ -6539,7 +6561,7 @@ msgstr "à°ˆ నోటీసà±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±ƒà°¤à°¿à°‚à°šà±"
msgid "Revoke the \"%s\" role from this user"
msgstr "à°ˆ à°—à±à°‚à°ªà±à°¨à±à°‚à°¡à°¿ à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6722,56 +6744,56 @@ msgid "Moderator"
msgstr "సమనà±à°µà°¯à°•à°°à±à°¤"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 28869e63f..16cde8b08 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:10+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:54+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -185,15 +185,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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 ""
@@ -204,22 +204,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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ı."
@@ -229,12 +229,12 @@ msgstr "Onay kodu bulunamadı."
#: 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:209
+#: 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 ""
@@ -266,7 +266,7 @@ msgstr "Profil kaydedilemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -608,8 +608,8 @@ msgstr ""
msgid "Account"
msgstr "Hakkında"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -617,8 +617,8 @@ msgid "Nickname"
msgstr "Takma ad"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Parola"
@@ -634,11 +634,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "İstek bulunamadı!"
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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 ""
@@ -1528,7 +1528,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
@@ -1763,13 +1763,13 @@ msgstr "Kullanıcının profili yok."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1913,7 +1913,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 +2312,41 @@ msgstr "Bize o profili yollamadınız"
msgid "%1$s left group %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Zaten giriş yapılmış."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Yanlış kullanıcı adı veya parola."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "YetkilendirilmemiÅŸ."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "GiriÅŸ"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Parolamı unuttum veya kaybettim"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2354,12 +2354,12 @@ msgstr ""
"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
"ve parolanızı tekrar giriniz."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Geçersiz kullanıcı adı veya parola."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2564,31 +2564,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2700,7 +2700,7 @@ msgid "6 or more characters"
msgstr "6 veya daha fazla karakter"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Onayla"
@@ -2712,11 +2712,11 @@ msgstr "yukarıdaki parolanın aynısı"
msgid "Change"
msgstr "DeÄŸiÅŸtir"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Parolalar birbirini tutmuyor."
@@ -2954,45 +2954,45 @@ msgstr ""
"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
"verilmez"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tam Ä°sim"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Başlangıç Sayfası"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Hakkında"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Yer"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
@@ -3032,7 +3032,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
@@ -3284,7 +3284,7 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
msgid "Password and confirmation do not match."
msgstr "Parola ve onaylaması birbirini tutmuyor."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
@@ -3292,73 +3292,95 @@ msgstr "Kullanıcı ayarlamada hata oluştu."
msgid "New password successfully saved. You are now logged in."
msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Onay kodu hatası."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php: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, "
@@ -3367,7 +3389,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 "
@@ -3386,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.)"
@@ -3466,7 +3488,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"
@@ -3538,7 +3560,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."
@@ -3600,7 +3622,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"
@@ -3613,7 +3635,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"
@@ -4573,7 +4595,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 ""
@@ -4697,29 +4719,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 "
@@ -4727,7 +4749,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 "
@@ -4735,40 +4757,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:779
#, 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 ""
@@ -4811,48 +4833,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5485,12 +5507,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."
@@ -5584,14 +5606,14 @@ msgstr "Tam Ä°sim"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6090,8 +6112,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6113,19 +6142,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Hakkında"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6139,30 +6168,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s durum"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6179,13 +6208,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6205,13 +6234,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6233,7 +6262,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6241,13 +6270,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6284,7 +6313,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 ""
@@ -6444,26 +6473,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ı"
@@ -6576,7 +6605,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6601,7 +6630,7 @@ msgstr ""
msgid "Popular"
msgstr "KiÅŸi Arama"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Böyle bir belge yok."
@@ -6625,7 +6654,7 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Revoke the \"%s\" role from this user"
msgstr "Böyle bir kullanıcı yok."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6813,56 +6842,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 349e2da72..dbf7fc836 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:13+0000\n"
+"POT-Creation-Date: 2010-05-27 22:55+0000\n"
+"PO-Revision-Date: 2010-06-03 23:02:57+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -188,14 +188,14 @@ msgstr ""
"«розштовхати» %s або щоÑÑŒ йому напиÑати."
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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!"
@@ -206,22 +206,22 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 метод не знайдено."
@@ -230,12 +230,12 @@ msgstr "API метод не знайдено."
#: 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:209
+#: 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."
@@ -266,7 +266,7 @@ msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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\" вже викориÑтовуєтьÑÑ. Спробуйте інше."
-#: 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
@@ -602,8 +602,8 @@ msgstr ""
msgid "Account"
msgstr "Ðкаунт"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +611,8 @@ msgid "Nickname"
msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -628,11 +628,11 @@ msgstr "Дозволити"
msgid "Allow or deny access to your account information."
msgstr "Дозволити або заборонити доÑтуп до Вашого облікового запиÑу."
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "Цей метод потребує або ÐÐПИСÐТИ, або ВИДÐЛИТИ."
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе знайдено."
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s загальна Ñтрічка"
-#: actions/apitimelinepublic.php:201 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,11 +820,11 @@ msgstr "Ðватару видалено."
msgid "You already blocked that user."
msgstr "Цього кориÑтувача вже заблоковано."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокувати кориÑтувача"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -839,7 +839,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -848,7 +848,7 @@ msgstr "ÐÑ–"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ðе блокувати цього кориÑтувача"
@@ -857,7 +857,7 @@ msgstr "Ðе блокувати цього кориÑтувача"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -865,11 +865,11 @@ msgid "Yes"
msgstr "Так"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати кориÑтувача"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð¾ÑÑŒ невдачею."
@@ -1030,7 +1030,7 @@ msgstr "Видалити додаток"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ðе увійшли."
@@ -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 "Видалити допиÑ"
@@ -1477,7 +1477,7 @@ msgid "Cannot normalize that email address"
msgstr "Ðе можна полагодити цю поштову адреÑу"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Це недійÑна електронна адреÑа."
@@ -1703,13 +1703,13 @@ msgstr "КориÑтувач вже має цю роль."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ðе визначено жодного профілю."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ðе визначено профілю з таким ID."
@@ -1850,7 +1850,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 Ñтрічка"
@@ -2279,41 +2279,41 @@ msgstr "Ви не Ñ” учаÑником цієї групи."
msgid "%1$s left group %2$s"
msgstr "%1$s залишив групу %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Тепер Ви увійшли."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Ðеточне Ñ–Ð¼â€™Ñ Ð°Ð±Ð¾ пароль."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Вхід на Ñайт"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Пам’Ñтати мене"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ðвтоматично входити у майбутньому; не Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿â€™ÑŽÑ‚ÐµÑ€Ñ–Ð² загального "
"кориÑтуваннÑ!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Загубили або забули пароль?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2321,11 +2321,11 @@ msgstr ""
"З міркувань безпеки, будь лаÑка, введіть ще раз Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль, перед тим Ñк "
"змінювати налаштуваннÑ."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Увійти викориÑтовуючи Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2533,30 +2533,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримуєтьÑÑ."
@@ -2661,7 +2661,7 @@ msgid "6 or more characters"
msgstr "6 або більше знаків"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Підтвердити"
@@ -2673,11 +2673,11 @@ msgstr "Такий Ñамо, Ñк Ñ– пароль вище"
msgid "Change"
msgstr "Змінити"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Пароль має ÑкладатиÑÑŒ з 6-ти або більше знаків."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Паролі не Ñпівпадають."
@@ -2902,43 +2902,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 літери нижнього регіÑтру Ñ– цифри, ніÑкої пунктуації або інтервалів"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Повне ім’Ñ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Веб-Ñторінка"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL-адреÑа Вашої веб-Ñторінки, блоґу, або профілю на іншому Ñайті"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишіть Ñебе та Ñвої інтереÑи (%d знаків)"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишіть Ñебе та Ñвої інтереÑи"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Про Ñебе"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "РозташуваннÑ"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Де Ви живете, на кшталт «МіÑто, облаÑÑ‚ÑŒ (регіон), країна»"
@@ -2981,7 +2981,7 @@ msgid ""
msgstr ""
"Ðвтоматично підпиÑуватиÑÑŒ до тих, хто підпиÑавÑÑ Ð´Ð¾ мене. (Слава роботам!)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (%d знаків макÑимум)."
@@ -3243,7 +3243,7 @@ msgstr "Пароль має ÑкладатиÑÑŒ з 6-ти або більше Ð
msgid "Password and confirmation do not match."
msgstr "Пароль та Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ñпівпадають."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Помилка в налаштуваннÑÑ… кориÑтувача."
@@ -3251,40 +3251,40 @@ msgstr "Помилка в налаштуваннÑÑ… кориÑтувача."
msgid "New password successfully saved. You are now logged in."
msgstr "Ðовий пароль уÑпішно збережено. Тепер Ви увійшли."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
"Пробачте, але лише Ñ‚Ñ–, кого було запрошено, мають змогу зареєÑтруватиÑÑŒ тут."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Даруйте, помилка у коді запрошеннÑ."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÑƒÑпішна"
-#: actions/register.php:114 actions/register.php: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. "
@@ -3292,35 +3292,57 @@ msgstr ""
"Ð¦Ñ Ñ„Ð¾Ñ€Ð¼Ð° дозволить вам Ñтворити новий акаунт. Ви зможете робити допиÑи Ñ– "
"будете в курÑÑ– Ñправ ваших друзів та колег. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 літери нижнього регіÑтра Ñ– цифри, ніÑкої пунктуації або інтервалів. "
"Ðеодмінно."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 або більше знаків. Ðеодмінно."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Такий Ñамо, Ñк Ñ– пароль вище. Ðеодмінно."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Пошта"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "ВикориÑтовуєтьÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½ÑŒ, оголошень та Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Повне ім’Ñ, звіÑно ж Ваше Ñправжнє Ñ–Ð¼â€™Ñ :)"
-#: actions/register.php: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, "
@@ -3329,7 +3351,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 "
@@ -3362,7 +3384,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.)"
@@ -3443,7 +3465,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 "Повторено"
@@ -3517,7 +3539,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"
@@ -3574,7 +3596,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 "Ім’Ñ"
@@ -3585,7 +3607,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 "ОпиÑ"
@@ -3783,8 +3805,9 @@ msgstr ""
"**%s** це група на %%%%site.name%%%% — ÑервіÑÑ– [мікроблоґів](http://uk."
"wikipedia.org/wiki/Мікроблоггінг), Ñкий працює на вільному програмному "
"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблÑÑ‚ÑŒ "
-"короткі допиÑи про Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° інтереÑи. [ПриєднуйтеÑÑŒ](%%action.register%"
-"%) зараз Ñ– долучітьÑÑ Ð´Ð¾ ÑпілкуваннÑ! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%doc.help%%))"
+"короткі допиÑи про Ñвоє Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° інтереÑи. [ПриєднуйтеÑÑŒ](%%%%action.register"
+"%%%%) зараз Ñ– долучітьÑÑ Ð´Ð¾ ÑпілкуваннÑ! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%%%doc.help%%%"
+"%))"
#: actions/showgroup.php:469
#, php-format
@@ -3892,9 +3915,9 @@ msgid ""
msgstr ""
"**%s** кориÑтуєтьÑÑ %%%%site.name%%%% — ÑервіÑом [мікроблоґів](http://uk."
"wikipedia.org/wiki/Мікроблоґ), Ñкий працює на вільному програмному "
-"забезпеченні [StatusNet](http://status.net/). [ПриєднуйтеÑÑŒ](%%action."
-"register%%) зараз Ñ– Ñлідкуйте за допиÑами **%s**, також на Ð’Ð°Ñ Ñ‡ÐµÐºÐ°Ñ” багато "
-"іншого! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%doc.help%%))"
+"забезпеченні [StatusNet](http://status.net/). [ПриєднуйтеÑÑŒ](%%%%action."
+"register%%%%) зараз Ñ– Ñлідкуйте за допиÑами **%s**, також на Ð’Ð°Ñ Ñ‡ÐµÐºÐ°Ñ” "
+"багато іншого! ([ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -4559,7 +4582,7 @@ msgstr ""
"підпиÑатиÑÑŒ на допиÑи цього кориÑтувача. Якщо Ви не збиралиÑÑŒ підпиÑуватиÑÑŒ "
"ні на чиї допиÑи, проÑто натиÑніть «Відмінити»."
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr "ЛіцензіÑ"
@@ -4689,18 +4712,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, "
@@ -4709,11 +4732,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 "
@@ -4725,7 +4748,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 "
@@ -4737,7 +4760,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 "
@@ -4746,20 +4769,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:779
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 "
@@ -4768,12 +4791,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 байтів."
@@ -4812,27 +4835,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."
@@ -4840,21 +4863,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5446,11 +5469,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 "Змінювати пароль не дозволено"
@@ -5544,14 +5567,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"
@@ -6085,8 +6108,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"
@@ -6112,19 +6145,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"
@@ -6146,18 +6179,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 ""
@@ -6165,13 +6198,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 "
@@ -6199,13 +6232,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ðове приватне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %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"
@@ -6239,13 +6272,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додав(ла) Ваш Ð´Ð¾Ð¿Ð¸Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ…"
#. 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"
@@ -6283,7 +6316,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"
@@ -6294,13 +6327,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"
@@ -6363,7 +6396,7 @@ msgstr ""
"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð°Ð±Ð¸ долучити кориÑтувачів до розмови. Такі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ñ‡Ð¸Ñ‚Ðµ "
"лише Ви."
-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:227 lib/noticelist.php:497
msgid "from"
msgstr "від"
@@ -6522,23 +6555,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 "Ð”Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ð»Ð¸"
@@ -6648,7 +6681,7 @@ msgstr "Середньодобове"
msgid "All groups"
msgstr "Ð’ÑÑ– групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Метод не виконуєтьÑÑ."
@@ -6672,7 +6705,7 @@ msgstr "ПоÑтаті"
msgid "Popular"
msgstr "ПопулÑрне"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Ðемає аргументів return-to."
@@ -6693,7 +6726,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 "КориÑтувача Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾ÐºÐ¾Ñ€Ð¸Ñтувацького режиму не визначено."
@@ -6871,56 +6904,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "міÑÑць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "близько %d міÑÑців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 5c22fbad6..38c8a7d1a 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:17+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:03:01+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -184,15 +184,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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 ""
@@ -203,22 +203,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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!"
@@ -228,12 +228,12 @@ msgstr "Phương thức API không tìm thấy!"
#: 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:209
+#: 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."
@@ -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:222 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:114
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
@@ -610,8 +610,8 @@ msgstr ""
msgid "Account"
msgstr "Giới thiệu"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +619,8 @@ msgid "Nickname"
msgstr "Biệt danh"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Mật khẩu"
@@ -636,11 +636,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
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:131
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:252 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:293 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:316 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:196 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:201 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 ""
@@ -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"
@@ -1555,7 +1555,7 @@ msgid "Cannot normalize that email address"
msgstr "Không thể bình thÆ°á»ng hóa địa chỉ GTalk này"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Äịa chỉ email không hợp lệ."
@@ -1803,13 +1803,13 @@ msgstr "NgÆ°á»i dùng không có thông tin."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
#, fuzzy
msgid "No profile with that ID."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
@@ -1959,7 +1959,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 +2394,40 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
msgid "%1$s left group %2$s"
msgstr "%s và nhóm"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Äã đăng nhập."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Äăng nhập"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mất hoặc quên mật khẩu?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2435,12 +2435,12 @@ msgstr ""
"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
"đổi trong Ä‘iá»u chỉnh."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2654,31 +2654,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -2793,7 +2793,7 @@ msgid "6 or more characters"
msgstr "Nhiá»u hÆ¡n 6 ký tá»±"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Xác nhận"
@@ -2805,12 +2805,12 @@ msgstr "Cùng mật khẩu ở trên"
msgid "Change"
msgstr "Thay đổi"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
#, fuzzy
msgid "Password must be 6 or more characters."
msgstr "Mật khẩu phải nhiá»u hÆ¡n 6 ký tá»±."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Mật khẩu không khớp."
@@ -3052,44 +3052,44 @@ msgstr "Hồ sơ này không biết"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 chữ cái thÆ°á»ng hoặc là chữ số, không có dấu chấm hay "
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tên đầy đủ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL vỠTrang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Nói vỠbạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Nói vỠbạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Lý lịch"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Thành phố"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
@@ -3129,7 +3129,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Tá»± Ä‘á»™ng theo những ngÆ°á»i nào đăng ký theo tôi"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
@@ -3385,7 +3385,7 @@ msgstr "Mật khẩu phải nhiá»u hÆ¡n 6 ký tá»±."
msgid "Password and confirmation do not match."
msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Lỗi xảy ra khi tạo thành viên."
@@ -3393,82 +3393,104 @@ msgstr "Lỗi xảy ra khi tạo thành viên."
msgid "New password successfully saved. You are now logged in."
msgstr "Mật khẩu má»›i đã được lÆ°u. Bạn có thể đăng nhập ngay bây giá»."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Lỗi xảy ra với mã xác nhận."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Äăng ký thành công"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3499,7 +3521,7 @@ msgstr ""
"\n"
"Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
-#: actions/register.php:566
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3586,7 +3608,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"
@@ -3658,7 +3680,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."
@@ -3721,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"
@@ -3734,7 +3756,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ả"
@@ -4717,7 +4739,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 ""
@@ -4848,29 +4870,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 "
@@ -4878,7 +4900,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 "
@@ -4886,40 +4908,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:779
#, 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 ""
@@ -4965,48 +4987,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -5644,12 +5666,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."
@@ -5747,14 +5769,14 @@ msgstr "Tên đầy đủ"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thành phố: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
@@ -6278,8 +6300,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6301,19 +6330,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Thành phố: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Dia chi email moi de gui tin nhan den %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6335,30 +6364,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, fuzzy, php-format
msgid "%s status"
msgstr "Trạng thái của %1$s vào %2$s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Xác nhận SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Äó không phải là số Ä‘iện thoại của bạn."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6375,13 +6404,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Bạn có tin nhắn riêng từ %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6415,13 +6444,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6456,7 +6485,7 @@ msgstr ""
"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6464,13 +6493,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6507,7 +6536,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ừ "
@@ -6671,26 +6700,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"
@@ -6808,7 +6837,7 @@ msgstr ""
msgid "All groups"
msgstr "Nhóm"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6835,7 +6864,7 @@ msgstr ""
msgid "Popular"
msgstr "Tên tài khoản"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Không có tài liệu nào."
@@ -6859,7 +6888,7 @@ msgstr "Trả lá»i tin nhắn này"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ban user"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -7056,56 +7085,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "vài giây trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1 phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1 giá» trÆ°á»›c"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d giá» trÆ°á»›c"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "1 ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "1 tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 71d3293f4..9a03f8ada 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:20+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:03:04+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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 +124,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:87
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s 和好å‹ï¼Œç¬¬%2$d页"
@@ -132,39 +132,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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,14 +187,14 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
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:215
-#: 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 和好å‹çš„æ›´æ–°ï¼"
@@ -205,22 +205,22 @@ msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 方法未实现ï¼"
@@ -230,12 +230,12 @@ msgstr "API 方法未实现ï¼"
#: 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:209
+#: 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请求。"
@@ -267,7 +267,7 @@ msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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
#, 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:114
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 "无法删除收è—。"
@@ -400,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 "组动作"
@@ -531,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
@@ -607,8 +607,8 @@ msgstr ""
msgid "Account"
msgstr "å¸å·"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -616,8 +616,8 @@ msgid "Nickname"
msgstr "昵称"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "密ç "
@@ -634,11 +634,11 @@ msgstr "全部"
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr "此方法接å—POST或DELETE请求。"
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
msgid "You may not delete another user's status."
msgstr "您ä¸èƒ½åˆ é™¤å…¶ä»–用户的状æ€ã€‚"
@@ -657,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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "未找到"
-#: actions/apistatusesupdate.php:316 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 "ä¸æ”¯æŒè¿™ç§å›¾åƒæ ¼å¼ã€‚"
-#: 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "æ¥è‡ªæ‰€æœ‰äººçš„ %s 消æ¯ï¼"
@@ -727,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 çš„æ›´æ–°ï¼"
@@ -791,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 "删除"
@@ -835,12 +835,12 @@ msgstr "头åƒå·²æ›´æ–°ã€‚"
msgid "You already blocked that user."
msgstr "您已æˆåŠŸé˜»æ­¢è¯¥ç”¨æˆ·ï¼š"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "阻止用户"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -852,7 +852,7 @@ msgstr ""
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -862,7 +862,7 @@ msgstr "å¦"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:149 actions/deleteuser.php:156
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "å–消阻止次用户"
@@ -872,7 +872,7 @@ msgstr "å–消阻止次用户"
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -881,12 +881,12 @@ msgid "Yes"
msgstr "是"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ä¿å­˜é˜»æ­¢ä¿¡æ¯å¤±è´¥ã€‚"
@@ -1058,7 +1058,7 @@ msgstr "删除通告"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "未登录。"
@@ -1089,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 "删除通告"
@@ -1540,7 +1540,7 @@ msgid "Cannot normalize that email address"
msgstr "无法识别此电å­é‚®ä»¶"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å­é‚®ä»¶ã€‚"
@@ -1781,14 +1781,14 @@ msgstr "用户没有个人信æ¯ã€‚"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
#, fuzzy
msgid "No profile specified."
msgstr "没有收件人。"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
#, fuzzy
msgid "No profile with that ID."
msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚"
@@ -1938,7 +1938,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 时间表"
@@ -2354,51 +2354,51 @@ msgstr "您未告知此个人信æ¯"
msgid "%1$s left group %2$s"
msgstr "%s 离开群 %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登录。"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "用户å或密ç ä¸æ­£ç¡®ã€‚"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "未认è¯ã€‚"
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "è®°ä½ç™»å½•çŠ¶æ€"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "ä¿æŒè¿™å°æœºå™¨ä¸Šçš„登录状æ€ã€‚ä¸è¦åœ¨å…±ç”¨çš„机器上ä¿æŒç™»å½•ï¼"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "忘记了密ç ï¼Ÿ"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "由于安全原因,修改设置å‰éœ€è¦è¾“入用户å和密ç ã€‚"
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "输入用户å和密ç ä»¥ç™»å½•ã€‚"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2606,31 +2606,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚"
@@ -2743,7 +2743,7 @@ msgid "6 or more characters"
msgstr "6 个或更多字符"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "确认"
@@ -2755,11 +2755,11 @@ msgstr "相åŒçš„密ç "
msgid "Change"
msgstr "修改"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "密ç å¿…é¡»åŒ…å« 6 个或更多字符。"
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "密ç ä¸åŒ¹é…。"
@@ -2995,44 +2995,44 @@ msgstr "未知的å¸å·"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个å°å†™å­—æ¯æˆ–数字,ä¸åŒ…å«æ ‡ç‚¹åŠç©ºç™½"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "å…¨å"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "您的主页ã€åšå®¢æˆ–在其他站点的URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "用ä¸è¶…过140个字符æ述您自己和您的爱好"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "用ä¸è¶…过140个字符æ述您自己和您的爱好"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自述"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "ä½ç½®"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "ä½ çš„ä½ç½®ï¼Œæ ¼å¼ç±»ä¼¼\"城市,çœä»½ï¼Œå›½å®¶\""
@@ -3072,7 +3072,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自动订阅任何订阅我的更新的人(这个选项最适åˆæœºå™¨äºº)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(ä¸èƒ½è¶…过140字符)。"
@@ -3325,7 +3325,7 @@ msgstr "密ç å¿…须是 6 个字符或更多。"
msgid "Password and confirmation do not match."
msgstr "密ç å’Œç¡®è®¤ä¸åŒ¹é…。"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ä¿å­˜ç”¨æˆ·è®¾ç½®æ—¶å‡ºé”™ã€‚"
@@ -3333,79 +3333,101 @@ msgstr "ä¿å­˜ç”¨æˆ·è®¾ç½®æ—¶å‡ºé”™ã€‚"
msgid "New password successfully saved. You are now logged in."
msgstr "新密ç å·²ä¿å­˜ï¼Œæ‚¨çŽ°åœ¨å·²ç™»å½•ã€‚"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "对ä¸èµ·ï¼Œè¯·é‚€è¯·é‚£äº›èƒ½æ³¨å†Œçš„人。"
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "验è¯ç å‡ºé”™ã€‚"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "注册æˆåŠŸã€‚"
-#: actions/register.php:114 actions/register.php: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 "
@@ -3436,7 +3458,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.)"
@@ -3522,7 +3544,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 "创建"
@@ -3594,7 +3616,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 "头åƒå·²æ›´æ–°ã€‚"
@@ -3657,7 +3679,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"
@@ -3670,7 +3692,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"
@@ -4649,7 +4671,7 @@ msgstr ""
"请检查详细信æ¯ï¼Œç¡®è®¤å¸Œæœ›è®¢é˜…此用户的通告。如果您刚æ‰æ²¡æœ‰è¦æ±‚订阅任何人的通"
"告,请点击\"å–消\"。"
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
#, fuzzy
msgid "License"
msgstr "注册è¯"
@@ -4778,29 +4800,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 "
@@ -4808,7 +4830,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 "
@@ -4816,40 +4838,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:779
#, 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 ""
@@ -4893,49 +4915,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5576,12 +5598,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 "密ç å·²ä¿å­˜ã€‚"
@@ -5674,14 +5696,14 @@ msgstr "å…¨å:%s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "ä½ç½®ï¼š%s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
@@ -6182,8 +6204,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注您的 %2$s ä¿¡æ¯ã€‚"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6204,7 +6233,7 @@ msgstr ""
"为您效力的 %4$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6212,13 +6241,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电å­é‚®ä»¶åœ°å€ï¼Œç”¨äºŽå‘布 %s ä¿¡æ¯"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6239,30 +6268,30 @@ msgstr ""
"为您效力的 %4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s 状æ€"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS短信确认"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "等待确认此电è¯å·ç ã€‚"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 振铃呼å«ä½ "
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6279,13 +6308,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s å‘é€äº†æ–°çš„ç§äººä¿¡æ¯"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6305,13 +6334,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s 收è—了您的通告"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6333,7 +6362,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6341,13 +6370,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6384,7 +6413,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 " 从 "
@@ -6547,27 +6576,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 "消æ¯å·²å‘布。"
@@ -6683,7 +6712,7 @@ msgstr ""
msgid "All groups"
msgstr "所有组"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6709,7 +6738,7 @@ msgstr "特å¾"
msgid "Popular"
msgstr "用户"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "没有这份文档。"
@@ -6733,7 +6762,7 @@ msgstr "无法删除通告。"
msgid "Revoke the \"%s\" role from this user"
msgstr "该组æˆå‘˜åˆ—表。"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6930,56 +6959,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "几秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "一分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "一å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "一天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d 天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "一个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d 个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "一年å‰"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index b7aca62bc..0ee3f2a05 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-24 14:16+0000\n"
-"PO-Revision-Date: 2010-05-03 19:19:23+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-06-03 23:03:11+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 (r65870); Translate extension (2010-05-01)\n"
+"X-Generator: MediaWiki 1.17alpha (r67302); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -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:65 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/all.php:76 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: 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:239 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
-#: 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:87
#, 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:209 actions/apitimelinehome.php:115
+#: actions/all.php:90 actions/all.php:182 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:104
#, 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:113
#, 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:122
#, 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:135
#, 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:140
#, 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:143
#, 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:146 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -181,15 +181,15 @@ msgid ""
msgstr ""
#. TRANS: H1 text
-#: actions/all.php:178
+#: actions/all.php:179
#, 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:215
-#: 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 ""
@@ -200,22 +200,22 @@ msgstr ""
#: 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:103 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:270
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
+#: 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 "確èªç¢¼éºå¤±"
@@ -225,12 +225,12 @@ msgstr "確èªç¢¼éºå¤±"
#: 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:209
+#: 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 ""
@@ -262,7 +262,7 @@ msgstr "無法儲存個人資料"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:222 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:114
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
@@ -599,8 +599,8 @@ msgstr ""
msgid "Account"
msgstr "關於"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -608,8 +608,8 @@ msgid "Nickname"
msgstr "暱稱"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr ""
@@ -625,11 +625,11 @@ msgstr ""
msgid "Allow or deny access to your account information."
msgstr ""
-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:108
msgid "This method requires a POST or DELETE."
msgstr ""
-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:131
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:252 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:293 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:282 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "ç›®å‰ç„¡è«‹æ±‚"
-#: actions/apistatusesupdate.php:316 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:196 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:201 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 ""
@@ -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 ""
@@ -1509,7 +1509,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "此信箱無效"
@@ -1742,13 +1742,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -1889,7 +1889,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,50 +2272,50 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登入"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "使用者å稱或密碼錯誤"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "未來在åŒä¸€éƒ¨é›»è…¦è‡ªå‹•ç™»å…¥"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "éºå¤±æˆ–忘記密碼了嗎?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "為安全起見,請先é‡æ–°è¼¸å…¥ä½ çš„使用者å稱與密碼å†æ›´æ”¹è¨­å®šã€‚"
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "使用者å稱或密碼無效"
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2514,31 +2514,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:1131
-#: lib/apiaction.php:1160 lib/apiaction.php:1277
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1157
+#: lib/apiaction.php:1186 lib/apiaction.php:1303
msgid "Not a supported data format."
msgstr ""
@@ -2648,7 +2648,7 @@ msgid "6 or more characters"
msgstr "6個以上字元"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "確èª"
@@ -2660,11 +2660,11 @@ msgstr ""
msgid "Change"
msgstr "更改"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr ""
@@ -2892,44 +2892,44 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64個å°å¯«è‹±æ–‡å­—æ¯æˆ–數字,勿加標點符號或空格"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "å…¨å"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "個人首é "
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "請在140個字以內æ述你自己與你的興趣"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "請在140個字以內æ述你自己與你的興趣"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自我介紹"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "地點"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2969,7 +2969,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹éŽé•·(å…±140個字元)"
@@ -3216,7 +3216,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "使用者設定發生錯誤"
@@ -3224,79 +3224,101 @@ msgstr "使用者設定發生錯誤"
msgid "New password successfully saved. You are now logged in."
msgstr "新密碼已儲存æˆåŠŸã€‚你已登入。"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "確èªç¢¼ç™¼ç”ŸéŒ¯èª¤"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php: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 "
@@ -3315,7 +3337,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.)"
@@ -3393,7 +3415,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 "新增"
@@ -3464,7 +3486,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 "更新個人圖åƒ"
@@ -3524,7 +3546,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"
@@ -3537,7 +3559,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"
@@ -4483,7 +4505,7 @@ msgid ""
"click “Rejectâ€."
msgstr ""
-#: actions/userauthorization.php:196 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:167
msgid "License"
msgstr ""
@@ -4605,29 +4627,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 "
@@ -4635,7 +4657,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 "
@@ -4643,40 +4665,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:779
#, 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 ""
@@ -4719,48 +4741,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:967
+#: 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:1533
+#: classes/Notice.php:1562
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5379,11 +5401,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 ""
@@ -5476,14 +5498,14 @@ msgstr "å…¨å"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr ""
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5973,8 +5995,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "ç¾åœ¨%1$s在%2$sæˆç‚ºä½ çš„粉絲囉"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5997,19 +6026,19 @@ msgstr ""
"敬上。\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "自我介紹"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6023,30 +6052,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6063,13 +6092,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6089,13 +6118,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "ç¾åœ¨%1$s在%2$sæˆç‚ºä½ çš„粉絲囉"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6117,7 +6146,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6125,13 +6154,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6168,7 +6197,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 ""
@@ -6327,25 +6356,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 "更新個人圖åƒ"
@@ -6458,7 +6487,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6482,7 +6511,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "無此文件"
@@ -6506,7 +6535,7 @@ msgstr "無此通知"
msgid "Revoke the \"%s\" role from this user"
msgstr "無此使用者"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6692,56 +6721,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php
new file mode 100644
index 000000000..ffd8bf455
--- /dev/null
+++ b/plugins/AutoSandbox/AutoSandboxPlugin.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to automatically sandbox newly registered users in an effort to beat
+ * spammers. If the user proves to be legitimate, moderators can un-sandbox them.
+ *
+ * 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 Sean Carmody<seancarmody@gmail.com>
+ * @copyright 2010
+ * @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);
+}
+
+define('AUTOSANDBOX', '0.1');
+
+//require_once(INSTALLDIR.'/plugins/AutoSandbox/autosandbox.php');
+
+class AutoSandboxPlugin extends Plugin
+{
+ var $contact;
+ var $debug;
+
+ function onInitializePlugin()
+ {
+ if(!isset($this->debug))
+ {
+ $this->debug = 0;
+ }
+
+ if(!isset($this->contact)) {
+ $default = common_config('newuser', 'default');
+ if (!empty($default)) {
+ $this->contact = $default;
+ }
+ }
+ }
+
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'AutoSandbox',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Sean Carmody',
+ 'homepage' => 'http://status.net/wiki/Plugin:AutoSandbox',
+ 'rawdescription' =>
+ _m('Automatically sandboxes newly registered members.'));
+ return true;
+ }
+
+ function onStartRegistrationFormData($action)
+ {
+
+ $instr = 'Note you will initially be "sandboxed" so your posts will not appear in the public timeline.';
+
+ if (isset($this->contact)) {
+ $contactuser = User::staticGet('nickname', $this->contact);
+ if (!empty($contactuser)) {
+ $contactlink = "@<a href=\"$contactuser->uri\">$contactuser->nickname</a>";
+ $instr = $instr . " Send a message to $contactlink to speed up the unsandboxing process.";
+ }
+ }
+
+ $output = common_markup_to_html($instr);
+ $action->elementStart('div', 'instructions');
+ $action->raw($output);
+ $action->elementEnd('div');
+ }
+
+ function onEndUserRegister(&$profile,&$user)
+ {
+ $profile->sandbox();
+ if ($this->debug) {
+ common_log(LOG_WARNING, "AutoSandbox: sandboxed of $user->nickname");
+ }
+ }
+}
diff --git a/plugins/AutoSandbox/LICENSE b/plugins/AutoSandbox/LICENSE
new file mode 100644
index 000000000..011faa4e7
--- /dev/null
+++ b/plugins/AutoSandbox/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2010 Stubborn Mule - http://www.stubbornmule.net
+AUTHORS:
+ Sean Carmody
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/plugins/AutoSandbox/README b/plugins/AutoSandbox/README
new file mode 100644
index 000000000..2f5d625f7
--- /dev/null
+++ b/plugins/AutoSandbox/README
@@ -0,0 +1,39 @@
+StatusNet AutoSandbox plugin 0.1 03/16/10
+=========================================
+Automatically sandboxes newly registered users as a spam-management technique.
+Only really suits small sites where all users can be hand-moderated. A moderator
+will then have to unbox legimate users, using the following built-in script:
+
+./scripts/userrole.php -n username -r moderator
+
+(replace 'username' with the nickname of the user you wish to make a moderator).
+
+The following note will be added to the top of the Registration form:
+
+"Note you will initially be "sandboxed" so your posts will not appear in the
+public timeline."
+
+This can be followed by the following extra information if a contact user (denoted
+here by XXX) is specified:
+
+"Send a message to @XXX to speed up the unsandboxing process."
+
+If no contact user is specified, it will default to the "Default subscription" user
+who automatically subscribes to new users (set in Admin -> User).
+
+Use:
+1. Add plugin:
+
+Default usage:
+addPlugin('AutoSandbox');
+
+Specify a contact user (replace 'someuser' with appropriate username):
+addPlugin('AutoSandbox', array('contact' => 'someuser'));
+
+Stop contact user from defaulting to the Defaul subscription:
+addPlugin('AutoSandbox', array('contact' => ''));
+
+Changelog
+=========
+0.1 initial release
+
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/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index f7f28b4d6..11e3c0b84 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/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/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
new file mode 100644
index 000000000..57f5ad89e
--- /dev/null
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -0,0 +1,79 @@
+<?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){
+ $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
+ if (common_logged_in()) {
+ $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/shorten.js b/plugins/ClientSideShorten/shorten.js
new file mode 100644
index 000000000..856c7f05f
--- /dev/null
+++ b/plugins/ClientSideShorten/shorten.js
@@ -0,0 +1,66 @@
+//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 shorten()
+ {
+ $noticeDataText = $('#'+SN.C.S.NoticeDataText);
+ if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){
+ 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 34c511e21..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 {
/**
@@ -46,7 +45,7 @@ class DirectionDetectorPlugin extends Plugin {
/**
* SN plugin API, here we will add css needed for modifiyed rendered
*
- * @param
+ * @param
*/
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}');
@@ -54,7 +53,7 @@ class DirectionDetectorPlugin extends Plugin {
/**
* 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,9 +94,9 @@ 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.
@@ -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
index ebeda2dc4..44bbcca4d 100644
--- a/plugins/DirectionDetector/locale/DirectionDetector.pot
+++ b/plugins/DirectionDetector/locale/DirectionDetector.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-29 23:39+0000\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"
@@ -16,6 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: DirectionDetectorPlugin.php:221
-msgid "shows notices with right-to-left content in correct direction."
+#: 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/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php
index 452f79024..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); }
@@ -52,8 +54,8 @@ class FirePHPPlugin extends Plugin
{
static $firephp_priorities = array(FirePHP::ERROR, FirePHP::ERROR, FirePHP::ERROR, FirePHP::ERROR,
FirePHP::WARN, FirePHP::LOG, FirePHP::LOG, FirePHP::INFO);
- $priority = $firephp_priorities[$priority];
- $this->firephp->fb($msg, $priority);
+ $fp_priority = $firephp_priorities[$priority];
+ $this->firephp->fb($msg, $fp_priority);
}
function onPluginVersion(&$versions)
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 e4fda5809..0bbd42e78 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/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/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index 483209676..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/
*/
@@ -31,48 +31,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once 'Net/LDAP2.php';
-
class LdapAuthenticationPlugin extends AuthenticationPlugin
{
- public $host=null;
- public $port=null;
- public $version=null;
- public $starttls=null;
- public $binddn=null;
- public $bindpw=null;
- public $basedn=null;
- public $options=null;
- public $filter=null;
- public $scope=null;
- public $password_encoding=null;
- public $attributes=array();
-
function onInitializePlugin(){
parent::onInitializePlugin();
- if(!isset($this->host)){
- throw new Exception("must specify a host");
- }
- if(!isset($this->basedn)){
- throw new Exception("must specify a basedn");
- }
if(!isset($this->attributes['nickname'])){
throw new Exception("must specify a nickname attribute");
}
- if(!isset($this->attributes['username'])){
- throw new Exception("must specify a username attribute");
- }
if($this->password_changeable && (! isset($this->attributes['password']) || !isset($this->password_encoding))){
throw new Exception("if password_changeable is set, the password attribute and password_encoding must also be specified");
}
+ $this->ldapCommon = new LdapCommon(get_object_vars($this));
}
function onAutoload($cls)
{
switch ($cls)
{
- case 'MemcacheSchemaCache':
- require_once(INSTALLDIR.'/plugins/LdapAuthentication/MemcacheSchemaCache.php');
+ case 'LdapCommon':
+ require_once(INSTALLDIR.'/plugins/LdapCommon/LdapCommon.php');
return false;
}
}
@@ -107,19 +84,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
function checkPassword($username, $password)
{
- $entry = $this->ldap_get_user($username);
- if(!$entry){
- return false;
- }else{
- $config = $this->ldap_get_config();
- $config['binddn']=$entry->dn();
- $config['bindpw']=$password;
- if($this->ldap_get_connection($config)){
- return true;
- }else{
- return false;
- }
- }
+ return $this->ldapCommon->checkPassword($username,$password);
}
function autoRegister($username, $nickname)
@@ -127,11 +92,16 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
if(is_null($nickname)){
$nickname = $username;
}
- $entry = $this->ldap_get_user($username,$this->attributes);
+ $entry = $this->ldapCommon->get_user($username,$this->attributes);
if($entry){
$registration_data = array();
foreach($this->attributes as $sn_attribute=>$ldap_attribute){
- $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single');
+ //ldap won't let us read a user's password,
+ //and we're going to set the password to a random string later anyways,
+ //so don't bother trying to read it.
+ if($sn_attribute != 'password'){
+ $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single');
+ }
}
if(isset($registration_data['email']) && !empty($registration_data['email'])){
$registration_data['email_confirmed']=true;
@@ -148,45 +118,12 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
function changePassword($username,$oldpassword,$newpassword)
{
- if(! isset($this->attributes['password']) || !isset($this->password_encoding)){
- //throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time'));
- return false;
- }
- $entry = $this->ldap_get_user($username);
- if(!$entry){
- return false;
- }else{
- $config = $this->ldap_get_config();
- $config['binddn']=$entry->dn();
- $config['bindpw']=$oldpassword;
- if($ldap = $this->ldap_get_connection($config)){
- $entry = $this->ldap_get_user($username,array(),$ldap);
-
- $newCryptedPassword = $this->hashPassword($newpassword, $this->password_encoding);
- if ($newCryptedPassword===false) {
- return false;
- }
- if($this->password_encoding=='ad') {
- //TODO I believe this code will work once this bug is fixed: http://pear.php.net/bugs/bug.php?id=16796
- $oldCryptedPassword = $this->hashPassword($oldpassword, $this->password_encoding);
- $entry->delete( array($this->attributes['password'] => $oldCryptedPassword ));
- }
- $entry->replace( array($this->attributes['password'] => $newCryptedPassword ), true);
- if( Net_LDAP2::isError($entry->upate()) ) {
- return false;
- }
- return true;
- }else{
- return false;
- }
- }
-
- return false;
+ return $this->ldapCommon->changePassword($username,$oldpassword,$newpassword);
}
function suggestNicknameForUsername($username)
{
- $entry = $this->ldap_get_user($username, $this->attributes);
+ $entry = $this->ldapCommon->get_user($username, $this->attributes);
if(!$entry){
//this really shouldn't happen
$nickname = $username;
@@ -198,203 +135,6 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
}
return common_nicknamize($nickname);
}
-
- //---utility functions---//
- function ldap_get_config(){
- $config = array();
- $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope');
- foreach($keys as $key){
- $value = $this->$key;
- if($value!==null){
- $config[$key]=$value;
- }
- }
- return $config;
- }
-
- function ldap_get_connection($config = null){
- if($config == null && isset($this->default_ldap)){
- return $this->default_ldap;
- }
-
- //cannot use Net_LDAP2::connect() as StatusNet uses
- //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
- //PEAR handling can be overridden on instance objects, so we do that.
- $ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config());
- $ldap->setErrorHandling(PEAR_ERROR_RETURN);
- $err=$ldap->bind();
- if (Net_LDAP2::isError($err)) {
- // if we were called with a config, assume caller will handle
- // incorrect username/password (LDAP_INVALID_CREDENTIALS)
- if (isset($config) && $err->getCode() == 0x31) {
- return null;
- }
- throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
- }
- if($config == null) $this->default_ldap=$ldap;
-
- $c = common_memcache();
- if (!empty($c)) {
- $cacheObj = new MemcacheSchemaCache(
- array('c'=>$c,
- 'cacheKey' => common_cache_key('ldap_schema:' . crc32(serialize($config)))));
- $ldap->registerSchemaCache($cacheObj);
- }
- return $ldap;
- }
-
- /**
- * get an LDAP entry for a user with a given username
- *
- * @param string $username
- * $param array $attributes LDAP attributes to retrieve
- * @return string DN
- */
- function ldap_get_user($username,$attributes=array(),$ldap=null){
- if($ldap==null) {
- $ldap = $this->ldap_get_connection();
- }
- $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
- $options = array(
- 'attributes' => $attributes
- );
- $search = $ldap->search($this->basedn, $filter, $options);
-
- if (PEAR::isError($search)) {
- common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage());
- return false;
- }
-
- $searchcount = $search->count();
- if($searchcount == 0) {
- return false;
- }else if($searchcount == 1) {
- $entry = $search->shiftEntry();
- return $entry;
- }else{
- common_log(LOG_WARNING, 'Found ' . $searchcount . ' ldap user with the username: ' . $username);
- return false;
- }
- }
-
- /**
- * Code originaly from the phpLDAPadmin development team
- * http://phpldapadmin.sourceforge.net/
- *
- * Hashes a password and returns the hash based on the specified enc_type.
- *
- * @param string $passwordClear The password to hash in clear text.
- * @param string $encodageType Standard LDAP encryption type which must be one of
- * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
- * @return string The hashed password.
- *
- */
-
- function hashPassword( $passwordClear, $encodageType )
- {
- $encodageType = strtolower( $encodageType );
- switch( $encodageType ) {
- case 'crypt':
- $cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2));
- break;
-
- case 'ext_des':
- // extended des crypt. see OpenBSD crypt man page.
- if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption.
- $cryptedPassword = '{CRYPT}' . crypt( $passwordClear, '_' . $this->randomSalt(8) );
- break;
-
- case 'md5crypt':
- if( ! defined( 'CRYPT_MD5' ) || CRYPT_MD5 == 0 ) {return FALSE;} //Your system crypt library does not support md5crypt encryption.
- $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$1$' . $this->randomSalt(9) );
- break;
-
- case 'blowfish':
- if( ! defined( 'CRYPT_BLOWFISH' ) || CRYPT_BLOWFISH == 0 ) {return FALSE;} //Your system crypt library does not support blowfish encryption.
- $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$2a$12$' . $this->randomSalt(13) ); // hardcoded to second blowfish version and set number of rounds
- break;
-
- case 'md5':
- $cryptedPassword = '{MD5}' . base64_encode( pack( 'H*' , md5( $passwordClear) ) );
- break;
-
- case 'sha':
- if( function_exists('sha1') ) {
- // use php 4.3.0+ sha1 function, if it is available.
- $cryptedPassword = '{SHA}' . base64_encode( pack( 'H*' , sha1( $passwordClear) ) );
- } elseif( function_exists( 'mhash' ) ) {
- $cryptedPassword = '{SHA}' . base64_encode( mhash( MHASH_SHA1, $passwordClear) );
- } else {
- return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
- }
- break;
-
- case 'ssha':
- if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) {
- mt_srand( (double) microtime() * 1000000 );
- $salt = mhash_keygen_s2k( MHASH_SHA1, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 );
- $cryptedPassword = "{SSHA}".base64_encode( mhash( MHASH_SHA1, $passwordClear.$salt ).$salt );
- } else {
- return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
- }
- break;
-
- case 'smd5':
- if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) {
- mt_srand( (double) microtime() * 1000000 );
- $salt = mhash_keygen_s2k( MHASH_MD5, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 );
- $cryptedPassword = "{SMD5}".base64_encode( mhash( MHASH_MD5, $passwordClear.$salt ).$salt );
- } else {
- return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
- }
- break;
-
- case 'ad':
- $cryptedPassword = '';
- $passwordClear = "\"" . $passwordClear . "\"";
- $len = strlen($passwordClear);
- for ($i = 0; $i < $len; $i++) {
- $cryptedPassword .= "{$passwordClear{$i}}\000";
- }
-
- case 'clear':
- default:
- $cryptedPassword = $passwordClear;
- }
-
- return $cryptedPassword;
- }
-
- /**
- * Code originaly from the phpLDAPadmin development team
- * http://phpldapadmin.sourceforge.net/
- *
- * Used to generate a random salt for crypt-style passwords. Salt strings are used
- * to make pre-built hash cracking dictionaries difficult to use as the hash algorithm uses
- * not only the user's password but also a randomly generated string. The string is
- * stored as the first N characters of the hash for reference of hashing algorithms later.
- *
- * --- added 20021125 by bayu irawan <bayuir@divnet.telkom.co.id> ---
- * --- ammended 20030625 by S C Rigler <srigler@houston.rr.com> ---
- *
- * @param int $length The length of the salt string to generate.
- * @return string The generated salt string.
- */
-
- function randomSalt( $length )
- {
- $possible = '0123456789'.
- 'abcdefghijklmnopqrstuvwxyz'.
- 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
- './';
- $str = "";
- mt_srand((double)microtime() * 1000000);
-
- while( strlen( $str ) < $length )
- $str .= substr( $possible, ( rand() % strlen( $possible ) ), 1 );
-
- return $str;
- }
function onPluginVersion(&$versions)
{
diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
index 042b2db8d..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/
*/
@@ -31,41 +31,28 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once 'Net/LDAP2.php';
-
class LdapAuthorizationPlugin extends AuthorizationPlugin
{
- public $host=null;
- public $port=null;
- public $version=null;
- public $starttls=null;
- public $binddn=null;
- public $bindpw=null;
- public $basedn=null;
- public $options=null;
- public $filter=null;
- public $scope=null;
- public $provider_name = null;
- public $uniqueMember_attribute = null;
public $roles_to_groups = array();
public $login_group = null;
- public $attributes = array();
function onInitializePlugin(){
- if(!isset($this->host)){
- throw new Exception("must specify a host");
- }
- if(!isset($this->basedn)){
- throw new Exception("must specify a basedn");
- }
if(!isset($this->provider_name)){
throw new Exception("provider_name must be set. Use the provider_name from the LDAP Authentication plugin.");
}
if(!isset($this->uniqueMember_attribute)){
throw new Exception("uniqueMember_attribute must be set.");
}
- if(!isset($this->attributes['username'])){
- throw new Exception("username attribute must be set.");
+ $this->ldapCommon = new LdapCommon(get_object_vars($this));
+ }
+
+ function onAutoload($cls)
+ {
+ switch ($cls)
+ {
+ case 'LdapCommon':
+ require_once(INSTALLDIR.'/plugins/LdapCommon/LdapCommon.php');
+ return false;
}
}
@@ -75,17 +62,17 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
$user_username->user_id=$user->id;
$user_username->provider_name=$this->provider_name;
if($user_username->find() && $user_username->fetch()){
- $entry = $this->ldap_get_user($user_username->username);
+ $entry = $this->ldapCommon->get_user($user_username->username);
if($entry){
if(isset($this->login_group)){
if(is_array($this->login_group)){
foreach($this->login_group as $group){
- if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){
+ if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$group)){
return true;
}
}
}else{
- if($this->ldap_is_dn_member_of_group($entry->dn(),$this->login_group)){
+ if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$this->login_group)){
return true;
}
}
@@ -107,17 +94,17 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
$user_username->user_id=$profile->id;
$user_username->provider_name=$this->provider_name;
if($user_username->find() && $user_username->fetch()){
- $entry = $this->ldap_get_user($user_username->username);
+ $entry = $this->ldapCommon->get_user($user_username->username);
if($entry){
if(isset($this->roles_to_groups[$name])){
if(is_array($this->roles_to_groups[$name])){
foreach($this->roles_to_groups[$name] as $group){
- if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){
+ if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$group)){
return true;
}
}
}else{
- if($this->ldap_is_dn_member_of_group($entry->dn(),$this->roles_to_groups[$name])){
+ if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$this->roles_to_groups[$name])){
return true;
}
}
@@ -127,94 +114,6 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
return false;
}
- function ldap_is_dn_member_of_group($userDn, $groupDn)
- {
- $ldap = $this->ldap_get_connection();
- $link = $ldap->getLink();
- $r = @ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn);
- if ($r === true){
- return true;
- }else if($r === false){
- return false;
- }else{
- common_log(LOG_ERR, "LDAP error determining if userDn=$userDn is a member of groupDn=groupDn using uniqueMember_attribute=$this->uniqueMember_attribute error: ".ldap_error($link));
- return false;
- }
- }
-
- function ldap_get_config(){
- $config = array();
- $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope');
- foreach($keys as $key){
- $value = $this->$key;
- if($value!==null){
- $config[$key]=$value;
- }
- }
- return $config;
- }
-
- //-----the below function were copied from LDAPAuthenticationPlugin. They will be moved to a utility class soon.----\\
- function ldap_get_connection($config = null){
- if($config == null && isset($this->default_ldap)){
- return $this->default_ldap;
- }
-
- //cannot use Net_LDAP2::connect() as StatusNet uses
- //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
- //PEAR handling can be overridden on instance objects, so we do that.
- $ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config());
- $ldap->setErrorHandling(PEAR_ERROR_RETURN);
- $err=$ldap->bind();
- if (Net_LDAP2::isError($err)) {
- // if we were called with a config, assume caller will handle
- // incorrect username/password (LDAP_INVALID_CREDENTIALS)
- if (isset($config) && $err->getCode() == 0x31) {
- return null;
- }
- throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
- return false;
- }
- if($config == null) $this->default_ldap=$ldap;
- return $ldap;
- }
-
- /**
- * get an LDAP entry for a user with a given username
- *
- * @param string $username
- * $param array $attributes LDAP attributes to retrieve
- * @return string DN
- */
- function ldap_get_user($username,$attributes=array(),$ldap=null){
- if($ldap==null) {
- $ldap = $this->ldap_get_connection();
- }
- if(! $ldap) {
- throw new Exception("Could not connect to LDAP");
- }
- $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
- $options = array(
- 'attributes' => $attributes
- );
- $search = $ldap->search(null,$filter,$options);
-
- if (PEAR::isError($search)) {
- common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage());
- return false;
- }
-
- if($search->count()==0){
- return false;
- }else if($search->count()==1){
- $entry = $search->shiftEntry();
- return $entry;
- }else{
- common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username);
- return false;
- }
- }
-
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'LDAP Authorization',
diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
new file mode 100644
index 000000000..1f1647a75
--- /dev/null
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Utility class of LDAP functions
+ *
+ * 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);
+}
+
+// We bundle the Net/LDAP2 library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib');
+
+class LdapCommon
+{
+ protected static $ldap_connections = array();
+ public $host=null;
+ public $port=null;
+ public $version=null;
+ public $starttls=null;
+ public $binddn=null;
+ public $bindpw=null;
+ public $basedn=null;
+ public $options=null;
+ public $filter=null;
+ public $scope=null;
+ public $uniqueMember_attribute = null;
+ public $attributes=array();
+ public $password_encoding=null;
+
+ public function __construct($config)
+ {
+ Event::addHandler('Autoload',array($this,'onAutoload'));
+ foreach($config as $key=>$value) {
+ $this->$key = $value;
+ }
+ $this->ldap_config = $this->get_ldap_config();
+
+ if(!isset($this->host)){
+ throw new Exception("must specify a host");
+ }
+ if(!isset($this->basedn)){
+ throw new Exception("must specify a basedn");
+ }
+ if(!isset($this->attributes['username'])){
+ throw new Exception("username attribute must be set.");
+ }
+ }
+
+ function onAutoload($cls)
+ {
+ switch ($cls)
+ {
+ case 'MemcacheSchemaCache':
+ require_once(INSTALLDIR.'/plugins/LdapCommon/MemcacheSchemaCache.php');
+ return false;
+ case 'Net_LDAP2':
+ require_once 'Net/LDAP2.php';
+ return false;
+ case 'Net_LDAP2_Filter':
+ require_once 'Net/LDAP2/Filter.php';
+ return false;
+ case 'Net_LDAP2_Filter':
+ require_once 'Net/LDAP2/Filter.php';
+ return false;
+ case 'Net_LDAP2_Entry':
+ require_once 'Net/LDAP2/Entry.php';
+ return false;
+ }
+ }
+
+ function get_ldap_config(){
+ $config = array();
+ $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope');
+ foreach($keys as $key){
+ $value = $this->$key;
+ if($value!==null){
+ $config[$key]=$value;
+ }
+ }
+ return $config;
+ }
+
+ function get_ldap_connection($config = null){
+ if($config == null) {
+ $config = $this->ldap_config;
+ }
+ $config_id = crc32(serialize($config));
+ if(array_key_exists($config_id,self::$ldap_connections)) {
+ $ldap = self::$ldap_connections[$config_id];
+ } else {
+ //cannot use Net_LDAP2::connect() as StatusNet uses
+ //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
+ //PEAR handling can be overridden on instance objects, so we do that.
+ $ldap = new Net_LDAP2($config);
+ $ldap->setErrorHandling(PEAR_ERROR_RETURN);
+ $err=$ldap->bind();
+ if (Net_LDAP2::isError($err)) {
+ // if we were called with a config, assume caller will handle
+ // incorrect username/password (LDAP_INVALID_CREDENTIALS)
+ if (isset($config) && $err->getCode() == 0x31) {
+ throw new LdapInvalidCredentialsException('Could not connect to LDAP server: '.$err->getMessage());
+ }
+ throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
+ }
+ $c = common_memcache();
+ if (!empty($c)) {
+ $cacheObj = new MemcacheSchemaCache(
+ array('c'=>$c,
+ 'cacheKey' => common_cache_key('ldap_schema:' . $config_id)));
+ $ldap->registerSchemaCache($cacheObj);
+ }
+ self::$ldap_connections[$config_id] = $ldap;
+ }
+ return $ldap;
+ }
+
+ function checkPassword($username, $password)
+ {
+ $entry = $this->get_user($username);
+ if(!$entry){
+ return false;
+ }else{
+ $config = $this->get_ldap_config();
+ $config['binddn']=$entry->dn();
+ $config['bindpw']=$password;
+ try {
+ $this->get_ldap_connection($config);
+ } catch (LdapInvalidCredentialsException $e) {
+ return false;
+ }
+ return true;
+ }
+ }
+
+ function changePassword($username,$oldpassword,$newpassword)
+ {
+ if(! isset($this->attributes['password']) || !isset($this->password_encoding)){
+ //throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time'));
+ return false;
+ }
+ $entry = $this->get_user($username);
+ if(!$entry){
+ return false;
+ }else{
+ $config = $this->get_ldap_config();
+ $config['binddn']=$entry->dn();
+ $config['bindpw']=$oldpassword;
+ try {
+ $ldap = $this->get_ldap_connection($config);
+
+ $entry = $this->get_user($username,array(),$ldap);
+
+ $newCryptedPassword = $this->hashPassword($newpassword, $this->password_encoding);
+ if ($newCryptedPassword===false) {
+ return false;
+ }
+ if($this->password_encoding=='ad') {
+ //TODO I believe this code will work once this bug is fixed: http://pear.php.net/bugs/bug.php?id=16796
+ $oldCryptedPassword = $this->hashPassword($oldpassword, $this->password_encoding);
+ $entry->delete( array($this->attributes['password'] => $oldCryptedPassword ));
+ }
+ $entry->replace( array($this->attributes['password'] => $newCryptedPassword ), true);
+ if( Net_LDAP2::isError($entry->upate()) ) {
+ return false;
+ }
+ return true;
+ } catch (LdapInvalidCredentialsException $e) {
+ return false;
+ }
+ }
+
+ return false;
+ }
+
+ function is_dn_member_of_group($userDn, $groupDn)
+ {
+ $ldap = $this->get_ldap_connection();
+ $link = $ldap->getLink();
+ $r = @ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn);
+ if ($r === true){
+ return true;
+ }else if($r === false){
+ return false;
+ }else{
+ common_log(LOG_ERR, "LDAP error determining if userDn=$userDn is a member of groupDn=$groupDn using uniqueMember_attribute=$this->uniqueMember_attribute error: ".ldap_error($link));
+ return false;
+ }
+ }
+
+ /**
+ * get an LDAP entry for a user with a given username
+ *
+ * @param string $username
+ * $param array $attributes LDAP attributes to retrieve
+ * @return string DN
+ */
+ function get_user($username,$attributes=array()){
+ $ldap = $this->get_ldap_connection();
+ $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username);
+ $options = array(
+ 'attributes' => $attributes
+ );
+ $search = $ldap->search(null,$filter,$options);
+
+ if (PEAR::isError($search)) {
+ common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage());
+ return false;
+ }
+
+ if($search->count()==0){
+ return false;
+ }else if($search->count()==1){
+ $entry = $search->shiftEntry();
+ return $entry;
+ }else{
+ common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username);
+ return false;
+ }
+ }
+
+ /**
+ * Code originaly from the phpLDAPadmin development team
+ * http://phpldapadmin.sourceforge.net/
+ *
+ * Hashes a password and returns the hash based on the specified enc_type.
+ *
+ * @param string $passwordClear The password to hash in clear text.
+ * @param string $encodageType Standard LDAP encryption type which must be one of
+ * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
+ * @return string The hashed password.
+ *
+ */
+
+ function hashPassword( $passwordClear, $encodageType )
+ {
+ $encodageType = strtolower( $encodageType );
+ switch( $encodageType ) {
+ case 'crypt':
+ $cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2));
+ break;
+
+ case 'ext_des':
+ // extended des crypt. see OpenBSD crypt man page.
+ if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption.
+ $cryptedPassword = '{CRYPT}' . crypt( $passwordClear, '_' . $this->randomSalt(8) );
+ break;
+
+ case 'md5crypt':
+ if( ! defined( 'CRYPT_MD5' ) || CRYPT_MD5 == 0 ) {return FALSE;} //Your system crypt library does not support md5crypt encryption.
+ $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$1$' . $this->randomSalt(9) );
+ break;
+
+ case 'blowfish':
+ if( ! defined( 'CRYPT_BLOWFISH' ) || CRYPT_BLOWFISH == 0 ) {return FALSE;} //Your system crypt library does not support blowfish encryption.
+ $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$2a$12$' . $this->randomSalt(13) ); // hardcoded to second blowfish version and set number of rounds
+ break;
+
+ case 'md5':
+ $cryptedPassword = '{MD5}' . base64_encode( pack( 'H*' , md5( $passwordClear) ) );
+ break;
+
+ case 'sha':
+ if( function_exists('sha1') ) {
+ // use php 4.3.0+ sha1 function, if it is available.
+ $cryptedPassword = '{SHA}' . base64_encode( pack( 'H*' , sha1( $passwordClear) ) );
+ } elseif( function_exists( 'mhash' ) ) {
+ $cryptedPassword = '{SHA}' . base64_encode( mhash( MHASH_SHA1, $passwordClear) );
+ } else {
+ return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
+ }
+ break;
+
+ case 'ssha':
+ if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) {
+ mt_srand( (double) microtime() * 1000000 );
+ $salt = mhash_keygen_s2k( MHASH_SHA1, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 );
+ $cryptedPassword = "{SSHA}".base64_encode( mhash( MHASH_SHA1, $passwordClear.$salt ).$salt );
+ } else {
+ return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
+ }
+ break;
+
+ case 'smd5':
+ if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) {
+ mt_srand( (double) microtime() * 1000000 );
+ $salt = mhash_keygen_s2k( MHASH_MD5, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 );
+ $cryptedPassword = "{SMD5}".base64_encode( mhash( MHASH_MD5, $passwordClear.$salt ).$salt );
+ } else {
+ return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
+ }
+ break;
+
+ case 'ad':
+ $cryptedPassword = '';
+ $passwordClear = "\"" . $passwordClear . "\"";
+ $len = strlen($passwordClear);
+ for ($i = 0; $i < $len; $i++) {
+ $cryptedPassword .= "{$passwordClear{$i}}\000";
+ }
+
+ case 'clear':
+ default:
+ $cryptedPassword = $passwordClear;
+ }
+
+ return $cryptedPassword;
+ }
+
+ /**
+ * Code originaly from the phpLDAPadmin development team
+ * http://phpldapadmin.sourceforge.net/
+ *
+ * Used to generate a random salt for crypt-style passwords. Salt strings are used
+ * to make pre-built hash cracking dictionaries difficult to use as the hash algorithm uses
+ * not only the user's password but also a randomly generated string. The string is
+ * stored as the first N characters of the hash for reference of hashing algorithms later.
+ *
+ * --- added 20021125 by bayu irawan <bayuir@divnet.telkom.co.id> ---
+ * --- ammended 20030625 by S C Rigler <srigler@houston.rr.com> ---
+ *
+ * @param int $length The length of the salt string to generate.
+ * @return string The generated salt string.
+ */
+
+ function randomSalt( $length )
+ {
+ $possible = '0123456789'.
+ 'abcdefghijklmnopqrstuvwxyz'.
+ 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+ './';
+ $str = "";
+ mt_srand((double)microtime() * 1000000);
+
+ while( strlen( $str ) < $length )
+ $str .= substr( $possible, ( rand() % strlen( $possible ) ), 1 );
+
+ return $str;
+ }
+
+}
+
+class LdapInvalidCredentialsException extends Exception
+{
+
+}
diff --git a/plugins/LdapAuthentication/MemcacheSchemaCache.php b/plugins/LdapCommon/MemcacheSchemaCache.php
index 6b91d17d6..4ee2e8e16 100644
--- a/plugins/LdapAuthentication/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/extlib/Net/LDAP2.php b/plugins/LdapCommon/extlib/Net/LDAP2.php
index 26f5e7560..26f5e7560 100644
--- a/extlib/Net/LDAP2.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2.php
diff --git a/extlib/Net/LDAP2/Entry.php b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php
index 66de96678..66de96678 100644
--- a/extlib/Net/LDAP2/Entry.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php
diff --git a/extlib/Net/LDAP2/Filter.php b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php
index 0723edab2..0723edab2 100644
--- a/extlib/Net/LDAP2/Filter.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php
diff --git a/extlib/Net/LDAP2/LDIF.php b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php
index 34f3e75dd..34f3e75dd 100644
--- a/extlib/Net/LDAP2/LDIF.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php
diff --git a/extlib/Net/LDAP2/RootDSE.php b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php
index 8dc81fd4f..8dc81fd4f 100644
--- a/extlib/Net/LDAP2/RootDSE.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php
diff --git a/extlib/Net/LDAP2/Schema.php b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
index b590eabc5..b590eabc5 100644
--- a/extlib/Net/LDAP2/Schema.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php
index e0c3094c4..e0c3094c4 100644
--- a/extlib/Net/LDAP2/SchemaCache.interface.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php
diff --git a/extlib/Net/LDAP2/Search.php b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php
index de4fde122..de4fde122 100644
--- a/extlib/Net/LDAP2/Search.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php
diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php
index 8019654ac..8019654ac 100644
--- a/extlib/Net/LDAP2/SimpleFileSchemaCache.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php
diff --git a/extlib/Net/LDAP2/Util.php b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php
index 48b03f9f9..48b03f9f9 100644
--- a/extlib/Net/LDAP2/Util.php
+++ b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index c3e37c0c0..1c3d6f84b 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/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/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.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/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/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/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 9eac9f6fc..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>
+ * @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/
@@ -215,16 +219,16 @@ class OpenIDPlugin extends Plugin
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,
@@ -232,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));
@@ -293,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');
}
@@ -329,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');
@@ -637,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/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
index 064e97642..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) {
@@ -115,8 +118,10 @@ class FinishaddopenidAction extends Action
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;
@@ -129,12 +134,14 @@ 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 (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;
}
@@ -176,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 415fd8e66..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
@@ -230,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;
}
@@ -239,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;
}
@@ -246,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;
}
@@ -256,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;
}
@@ -273,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;
}
@@ -282,6 +305,7 @@ 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;
}
@@ -346,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;
}
@@ -357,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;
}
@@ -364,6 +390,7 @@ 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;
}
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 8be02e031..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;
}
@@ -145,9 +146,12 @@ 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);
}
@@ -184,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);
@@ -202,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
@@ -218,6 +226,7 @@ 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.'));
@@ -253,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;
}
@@ -264,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;
}
@@ -293,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);
}
}
@@ -340,6 +352,7 @@ class AutosubmitAction extends Action
function title()
{
+ // TRANS: Title
return _m('OpenID Login Submission');
}
@@ -350,9 +363,11 @@ class AutosubmitAction extends Action
$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);
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index ffedc6481..20d6e070c 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -27,6 +27,7 @@ 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') {
$provider = common_config('openid', 'trusted_provider');
@@ -44,6 +45,7 @@ class OpenidloginAction extends Action
# 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;
}
@@ -73,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.');
}
}
@@ -110,6 +116,7 @@ class OpenidloginAction extends Action
function title()
{
+ // TRANS: OpenID plugin message. Title.
return _m('OpenID Login');
}
@@ -127,6 +134,7 @@ 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());
@@ -147,18 +155,23 @@ class OpenidloginAction extends Action
_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 afbca553f..0e16881c5 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/
*/
@@ -71,7 +73,7 @@ class OpenidserverAction extends Action
}else{
/* Go log in, and then come back. */
common_set_returnto($_SERVER['REQUEST_URI']);
- common_redirect(common_local_url('login'));
+ common_redirect(common_local_url('login'), 303);
return;
}
}else if(common_profile_url($user->nickname) == $request->identity || $request->idSelect()){
@@ -91,7 +93,7 @@ class OpenidserverAction extends Action
$_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl();
$_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl();
//ask the user to trust this trust root
- common_redirect(common_local_url('openidtrust'));
+ common_redirect(common_local_url('openidtrust'), 303);
return;
}
}else{
@@ -103,6 +105,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 +126,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/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index ddba942e6..2963e8997 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/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index 009a2f78e..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/
*/
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/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 6eac7dbb1..5e2e85878 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/SpotifyPlugin.php b/plugins/SpotifyPlugin.php
new file mode 100644
index 000000000..e7a5a5382
--- /dev/null
+++ b/plugins/SpotifyPlugin.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to create pretty Spotify URLs
+ *
+ * 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 Nick Holliday <n.g.holliday@gmail.com>
+ * @copyright Nick Holliday
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ *
+ * @see Event
+ */
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+define('SPOTIFYPLUGIN_VERSION', '0.1');
+
+/**
+ * Plugin to create pretty Spotify URLs
+ *
+ * The Spotify API is called before the notice is saved to gather artist and track information.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Nick Holliday <n.g.holliday@gmail.com>
+ * @copyright Nick Holliday
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ *
+ * @see Event
+ */
+
+class SpotifyPlugin extends Plugin
+{
+
+ function __construct()
+ {
+ parent::__construct();
+ }
+
+ function onStartNoticeSave($notice)
+ {
+ $notice->rendered = preg_replace_callback('/spotify:[a-z]{5,6}:[a-z0-9]{22}/i',
+ "renderSpotifyURILink",
+ $notice->rendered);
+
+ $notice->rendered = preg_replace_callback('/<a href="http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}" title="http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}" rel="external">http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}<\/a>/i',
+ "renderSpotifyHTTPLink",
+ $notice->rendered);
+
+ return true;
+ }
+
+ function userAgent()
+ {
+ return 'SpotifyPlugin/'.SPOTIFYPLUGIN_VERSION .
+ ' StatusNet/' . STATUSNET_VERSION;
+ }
+}
+
+function doSpotifyLookup($uri, $isArtist)
+{
+ $request = HTTPClient::start();
+ $response = $request->get('http://ws.spotify.com/lookup/1/?uri=' . $uri);
+ if ($response->isOk()) {
+ $xml = simplexml_load_string($response->getBody());
+
+ if($isArtist)
+ return $xml->name;
+ else
+ return $xml->artist->name . ' - ' . $xml->name;
+ }
+}
+
+function renderSpotifyURILink($match)
+{
+ $isArtist = false;
+ if(preg_match('/artist/', $match[0]) > 0) $isArtist = true;
+
+ $name = doSpotifyLookup($match[0], $isArtist);
+ return "<a href=\"{$match[0]}\">" . $name . "</a>";
+}
+
+function renderSpotifyHTTPLink($match)
+{
+ $match[0] = preg_replace('/<a href="http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}" title="http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}" rel="external">http:\/\/open.spotify.com\//i', 'spotify:', $match[0]);
+ $match[0] = preg_replace('/<\/a>/', '', $match[0]);
+ $match[0] = preg_replace('/\//', ':', $match[0]);
+
+ $isArtist = false;
+ if(preg_match('/artist/', $match[0]) > 0) $isArtist = true;
+
+ $name = doSpotifyLookup($match[0], $isArtist);
+ return "<a href=\"{$match[0]}\">" . $name . "</a>";
+}
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/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index e2d494a7b..b8e5addb1 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/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php
index 027624b7a..41f64bb26 100644
--- a/plugins/UrlShortener/UrlShortenerPlugin.php
+++ b/plugins/UrlShortener/UrlShortenerPlugin.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/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/docgen.php b/scripts/docgen.php
new file mode 100755
index 000000000..ac0a5c83d
--- /dev/null
+++ b/scripts/docgen.php
@@ -0,0 +1,114 @@
+#!/usr/bin/env php
+<?php
+
+$shortoptions = '';
+$longoptions = array('plugin=');
+
+
+$helptext = <<<ENDOFHELP
+Build HTML documentation from doc comments in source.
+
+Usage: docgen.php [options] output-directory
+Options:
+
+ --plugin=... build docs for given plugin instead of core
+
+
+ENDOFHELP;
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+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];
+ if (!is_dir($outdir)) {
+ echo "Output directory $outdir is not a directory.\n";
+ exit(1);
+ }
+} else {
+ print $helptext;
+ exit(1);
+}
+
+if ($plugin) {
+ $exclude = "*/extlib/*";
+ $indir = INSTALLDIR . "/plugins/" . $plugin;
+ if (!is_dir($indir)) {
+ $indir = INSTALLDIR . "/plugins";
+ $filename = "{$plugin}Plugin.php";
+ if (!file_exists("$indir/$filename")) {
+ echo "Can't find plugin $plugin.\n";
+ exit(1);
+ } else {
+ $pattern = $filename;
+ }
+ }
+} else {
+ $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%%' => getVersion(),
+ '%%indir%%' => $indir,
+ '%%pattern%%' => $pattern,
+ '%%outdir%%' => $outdir,
+ '%%htmlout%%' => $outdir,
+ '%%exclude%%' => $exclude,
+);
+
+var_dump($replacements);
+
+$template = file_get_contents(dirname(__FILE__) . '/doxygen.tmpl');
+$template = strtr($template, $replacements);
+
+$templateFile = tempnam(sys_get_temp_dir(), 'statusnet-doxygen');
+file_put_contents($templateFile, $template);
+
+$cmd = "doxygen " . escapeshellarg($templateFile);
+
+$retval = 0;
+passthru($cmd, $retval);
+
+if ($retval == 0) {
+ echo "Done!\n";
+ unlink($templateFile);
+ exit(0);
+} else {
+ echo "Failed! Doxygen config left in $templateFile\n";
+ exit($retval);
+}
+
diff --git a/scripts/doxygen.tmpl b/scripts/doxygen.tmpl
new file mode 100644
index 000000000..15d03e3bb
--- /dev/null
+++ b/scripts/doxygen.tmpl
@@ -0,0 +1,1516 @@
+# Doxyfile 1.6.1
+
+# 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
+
+# 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 = %%version%%
+
+# 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 = %%outdir%%
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = %%indir%%
+
+# 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 = YES
+
+# 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 = 8
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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= YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = YES
+
+# 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 = %%indir%%
+
+# 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 = %%pattern%%
+
+# 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 = YES
+
+# 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.
+
+# fixme for some reason this doesn't work?
+
+EXCLUDE = config.php extlib local plugins scripts
+
+# 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 = %%exclude%%
+
+# 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 =
+
+# 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 = YES
+
+# 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 = %%htmlout%%
+
+# 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_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 =
+
+# 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 =
+
+# 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 enable 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) or Qt help (GENERATE_QHP)
+# there is already a search function so this one should typically
+# be disabled.
+
+SEARCHENGINE = YES
+
+#---------------------------------------------------------------------------
+# 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.
+
+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 = NO
+
+# 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 = YES
+
+# 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 = YES
+
+# 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/update_translations.php b/scripts/update_translations.php
index 45fe460a0..89d937e9d 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -31,7 +31,7 @@ define('LACONICA', true); // compatibility
require_once(INSTALLDIR . '/lib/common.php');
// Master StatusNet .pot file location (created by update_pot.sh)
-$statusnet_pot = INSTALLDIR . '/locale/statusnet.po';
+$statusnet_pot = INSTALLDIR . '/locale/statusnet.pot';
set_time_limit(60);
@@ -98,7 +98,7 @@ foreach ($languages as $language) {
$new_file = curl_get_file($file_url);
if ($new_file === FALSE) {
- echo "Couldn't retrieve .po file for $code: $file_url\n";
+ echo "Could not retrieve .po file for $code: $file_url\n";
continue;
}